safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/examples/{SafePlan-liaoyuan → SafePlan-aode-ts}/comp.js

@@ -2,11 +2,26 @@ import {SearchList, date} from 'vue-client'
 import {PagedList} from 'vue-client'
 import {HttpResetClass,trans} from 'vue-client'
 import Vue from "vue"
-import ObjConfig from '../../src/plugins/GerJsonObjectConfig'
-
+import co from 'co'
+// let asyncReady = async function(self) {
+//   // 获取配置信息
+//   try {
+//     // 获取配置文件
+//     let http = new HttpResetClass()
+//     let res  = await http.load('GET', `/phone/rs/vue`, {}, {resolveMsg: null, rejectMsg: null})
+//     this.needconfig = res.data
+//   } catch (error) {
+//     // 忽略704,文件找不到异常R
+//     if (error.status !== 704) {
+//       throw error
+//     }
+//   }
+// }
 export default class Comp {
 
-
+  /*async constructor() {
+    await this.reaydy()
+  }*/
   needconfig= {}
   isSend=true
   // 用户安检信息列表
@@ -23,16 +38,13 @@ export default class Comp {
   orderList= ['按时间降序', '按时间升序']//排序下拉框的值
   currentorder='按时间降序'//排序下拉框当前选中的值
   // 新增安检计划时保存的数据
-  newPlan = {f_issued:"否",f_safecheck_type:""}
+  newPlan = {f_issued:"否",f_safecheck_type:"年度普检"}
   http = new HttpResetClass()
   //查询计划弹框中是否共享选项
   isAndNot = ["是", "否"]
   //用户类型
-  userType=["民用","非民用"]
-  listbuttona=[]
-  listbuttonb=[]
-  listbuttonc=[]
-  listbuttond=[]
+  userTypes = ["民用"]
+
   //安检计划查询中的是否是共享计划单选的当前选中值
   sIsAndNotSelect=''
   //用户列表的自选查询条件的值
@@ -53,36 +65,34 @@ export default class Comp {
   planItemConditionSelect="请选择条件"
   //当前输入的值
   planItemConditionValue=""
-  sudeState=['全部','是','否']
-  issude=''
+  //excel导入组件显示控制
+  showModel=false
   //safecheckTypeList=Vue.$appdata.getParam("安检类型")
-  safecheckTypeList=[]
-  //片区列表
-  sliceArea=[]
-  //抄表册
-  cbc=[]
-  //保存当前公司所有抄表册
-  meterbooks=[]
-  //分公司列表
-  orgs=[]
+  safecheckTypeList=["年度普检"]
 //安检员列表
-  checker=[]
+  checker=[
+
+  ]
+  //公司安检员列表
+  orgChecker=[]
+  residential_area=[]
   checkersname=[]
   //新建计划时保存是否共享计划的值，
   isShare="否"
   //安检类型
-  safecheckList=[]
+  safecheckList=["年度普检"]
+  //今年是否安检
+  yearChecked=["全部","已检","未检"]
+  yChecked=''
   //时间单位
   unitTime=["天","月"]
   selectTime="天"
   startday=""
   endday=""
   str=[]
-  userstates=['正常','停用']
-  //用气性质
-  gasproperties=['全部']
+  uploadCondition=''
 //当前打开的安检计划id
-  SelectedPlan=""
+  SelectedPlan={}
   //燃气表增添项
   gasexpress=[{"lname":"燃气表照片","type":"picture"},
     {"lname":"表品牌","type":"string","readonly":true},
@@ -95,53 +105,133 @@ export default class Comp {
   //当前分公司id
   filialeid=global.login.orgid
   filialeidname=global.login.orgs
-
-  //filialeid=287
-  //filialeidname="梁平区聚源天然气有限公司"
-  yearCheckList=['全部','已在计划中','未在计划中']
-  yChecked=""
+  orgs=[]
+  //filialeid=20284
+
+  usertypes=[]//用户类型
+  metertypes=[]//气表分类
+  pricetypes=[]//气价类型
+  pricenames=["22222","222221"]//气价名称---遍历获取
+  meterbrands= []//气表品牌---遍历获取
+  gasproperties=[]//用气性质
+  tablestate=[]//气表状态
   //用户列表查询条件json
   conditionJson=[
-    {column:"f_residential_area",checkname:"小区名称",type:"input"},
     {column:"f_building",checkname:"楼栋号码",type:"input"},
+    {column:"useraddress",checkname:"地址",type:"input"},
     {column:"f_unit",checkname:"单元号码",type:"input"},
-    {column:"userType",checkname:"用户类型",type:"selector",options:['民用','非民用']},
+    {column:"userType",checkname:"用户类型",type:"selector",options:['民用','非民用','煤改气']},
     {column:"f_user_state",checkname:"用户状态",type:"selector",options:['正常','停用']},
-    {column:"user_start",checkname:"开户起始",type:"date"},
-    {column:"user_end",checkname:"开户结束",type:"date"},
-    {column:"check_start",checkname:"安检起始",type:"date"},
-    {column:"check_end",checkname:"安检结束",type:"date"},
-    {column:"f_metertitles",checkname:"表箱号",type:"input"},
+    {column:"f_devices",checkname:"设备名称",type:"selector",options:['壁挂炉','热水器']},
     {column:"f_gasproperties",checkname:"用气性质",type:"selector",options:this.gasproperties},
-    ]
+    {column:"f_meter_classify",checkname:"气表分类",type:"selector",options:this.metertypes},
+    {column:"f_table_state",checkname:"气表状态",type:"selector",options:this.tablestate},
+    {column:"f_meter_brand",checkname:"气表品牌",type:"selector",options:this.meterbrands},
+    {column:"f_price_type",checkname:"气价类型",type:"selector",options:this.pricetypes},
+    {column:"f_price_name",checkname:"气价名称",type:"selector",options:this.pricenames}
+  ]
+
   conditionList=[
-    {selectitem:{column:"user_start",checkname:"开户起始",type:"date"},selectValue:'',num:0},
-    {selectitem:{column:"user_end",checkname:"开户结束",type:"date"},selectValue:'',num:1},
-    {selectitem:{column:"check_start",checkname:"安检起始",type:"date"},selectValue:'',num:2},
-    {selectitem:{column:"check_end",checkname:"安检结束",type:"date"},selectValue:'',num:3}
+    {selectitem:{column:"f_user_state",checkname:"用户状态",type:"selector",options:['正常','停用']},selectValue:'正常',num:0},
+    {selectitem:{column:"useraddress",checkname:"地址",type:"input"},selectValue:'',num:1},
+    {selectitem:{column:"userType",checkname:"用户类型",type:"selector",options:['民用','非民用','煤改气']},selectValue:'',num:2},
+    {selectitem:{column:"f_gasproperties",checkname:"用气性质",type:"selector",options:this.gasproperties},selectValue:'',num:3},
+    {selectitem:{column:"f_price_type",checkname:"气价类型",type:"selector",options:this.pricetypes},selectValue:'',num:4},
+    {selectitem:{column:"f_price_name",checkname:"气价名称",type:"selector",options:this.pricenames},selectValue:'',num:5},
+    {selectitem:{column:"f_meter_classify",checkname:"气表分类",type:"selector",options:this.metertypes},selectValue:'',num:6},
+    {selectitem:{column:"f_meter_brand",checkname:"气表品牌",type:"selector",options:this.meterbrands},selectValue:'',num:7},
+    {selectitem:{column:"f_table_state",checkname:"气表状态",type:"selector",options:this.tablestate},selectValue:'',num:8},
+    {selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:9}
   ]
   //安检项列表查询条件
   planitemconditionJson=[
-    {column:"f_last_check_state",checkname:"安检状态",type:"selector",options:['入户','拒检','到访不遇','未使用']},
+    {column:"f_last_check_state",checkname:"安检结果",type:"selector",options:['入户','拒检','到访不遇','未使用']},
     {column:"f_start_time",checkname:"开始时间",type:"date"},
     {column:"f_end_time",checkname:"结束时间",type:"date"},
     {column:"f_last_check_result",checkname:"隐患状态",type:"selector",options:['正常','有隐患']},
-    {column:"f_state1",checkname:"安检结果",type:"selector",options:['已检','未检']}
+    {column:"f_state1",checkname:"安检状态",type:"selector",options:['已检','未检']},
+    {column:"f_area",checkname:"小区名称",type:"input"},
   ]
   planitemconditionList=[
-    {selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:0},
-    {selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:1},
+    {selectitem:{column:"f_state1",checkname:"安检状态",type:"selector",options:['已检','未检']},selectValue:'',num:0},
+    {selectitem:{column:"f_area",checkname:"小区名称",type:"input"},selectValue:'',num:1},
     {selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:2}
   ]
+  //所有小区
+  areaList=[]
+  //存放小区模糊查询数据
+  areaText=''
+  //营收参数
+  saleParam=[]
+  //存放
+
+  SearchAreaList(f){
+    let arr=['全部']
+    this.areaList.forEach((area)=>{
+      if(area.f_residential_area.indexOf(this.areaText)!=-1){
+        console.log("area.f_residential_area:"+area.f_residential_area)
+        arr.push(area.f_residential_area)
+      }
+    })
+    this.residential_area=arr
+    f()
+  }
+
   //下拉框条件改变json数组
   conditionListChange(modelname,ind,key,value,f){
-    console.log("------------"+ind+"-------------")
-      this[modelname][ind]["num"]=ind
+    console.log("------------"+ind+"-------------"+value)
+    this[modelname][ind]["num"]=ind
     this[modelname][ind][key]=value
     f()
   }
-//添加选择条件下拉框事件
+  //条件改变时修改下级选项框值
+  conditionChangeFun(type,f){
+    console.log("开始刷新条件"+type)
+    if(type=='userType' || type=='f_gasproperties' || type=='f_price_type' ){
+      let usertype=''
+      let gastype=''
+      let pricetype=''
+      let idx=9999
+      this.conditionList.forEach((res)=>{
+        if(res.selectitem.checkname=='用户类型'){
+          usertype=res.selectValue
+        }else if(res.selectitem.checkname=='用气性质'){
+          gastype=res.selectValue
+        }else if(res.selectitem.checkname=='气价类型'){
+          pricetype=res.selectValue
+        }
+        if(res.selectitem.checkname=='气价名称'){
+          idx=res.num
+          this.conditionList[idx].selectitem.options=[]
+        }
+      })
 
+      console.log("三个值："+usertype+"---"+gastype+"---"+pricetype)
+      if(usertype && gastype && pricetype){
+        console.log("加载气价名称列表")
+        let arr=[]
+        this.saleParam.price.forEach((pri)=>{
+          if(pri.f_user_type==usertype && pri.f_price_type==pricetype && pri.f_gasproperties==gastype && pri.f_state=='有效'){
+            this.pricenames.push(pri.f_price_name)
+            if(idx!=9999){
+              this.conditionList[idx].selectitem.options.push(pri.f_price_name)
+            }
+          }
+        })
+      }else{
+        this.pricenames=[]
+      }
+      this.conditionJson[10].options=this.pricenames
+      console.log("气价名称："+this.pricenames)
+      f()
+    }
+  }
+  formatArrayFun(type,arr){
+    arr.forEach((result)=>{
+      this[type].push(result.value)
+    })
+  }
+//添加选择条件下拉框事件
   addconditionList(field,f){
     this[field].push({selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:this.conditionList.length})
     f()
@@ -160,22 +250,52 @@ export default class Comp {
     f()
   }
   async ready() {
-    await this.getOrgs()
     // 加载所有安检计划
-    await this.checkplan.searchList("/rs/sql/预约计划下发", {},{groupitem:"",f_filialeids:"("+this.filialeid+")",orderitem:"f_create_time desc"})
-   // this.getAreaList()
+    //this.readConfig()
+    if(!this.filialeid){
+      Vue.showMessage("未检测到分公司信息，请重新登陆！")
+      return
+    }
+    await this.getOrgs()
+    this.checkplan.search.setField("safechecktype",'年度普检')
+    await this.checkplan.searchList("/api/af-safecheck/sql/预约计划下发TS", {"f_plan_name": "f_plan_name like '%{}%'",
+      "f_plan_year":"f_plan_year={}",
+      "f_plan_month":"f_plan_month={}",
+      "checkerid":"f_checker_id='{}'",
+      "isAndNot":"f_checker {}",
+      "safechecktype":"f_safecheck_type='{}'"
+    },{groupitem:"",f_filialeids:"("+this.filialeid+")",orderitem:"f_create_time desc"})
+    this.user.search.setField("f_filialeid",this.filialeid)
+    this.setProperty('user', 'userType', '民用')
+    //获取营收表具气价参数值
+    new HttpResetClass().load('POST', '/api/af-safecheck/logic/getSaleInitData', {data:{
+        f_orgid: `${this.filialeid}`
+      }}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+      console.log("--------:"+JSON.stringify(res))
+      this.saleParam=res.data
+      if(this.saleParam.gasbrands.length>0){
+        this.saleParam.gasbrands.forEach((r)=>{
+          this.meterbrands.push(r.f_meter_brand)
+        })
+      }
+    })
+    console.log(this.conditionList[3].selectitem.options)
+    this.metertypes = this.formatArrayFun('metertypes',Vue.$appdata.getParam('气表类型'))
+    this.pricetypes = this.formatArrayFun('pricetypes',Vue.$appdata.getParam('气价类型'))
+    this.gasproperties = this.formatArrayFun('gasproperties',Vue.$appdata.getParam('用气性质'))
+    this.tablestate = this.formatArrayFun('tablestate',Vue.$appdata.getParam('气表状态'))
+    console.log(this.conditionList[3].selectitem.options)
+    //this.getGasMan()
+    await this.getAreaList()
     //加载安检员名单
     console.log("-----------------")
     console.log(Vue.$appdata)
-    this.setProperty("user","f_user_state",'正常')
     console.log("当前加载到的信息："+JSON.stringify(global.login))
-    this.formatArrayFun('gasproperties',Vue.$appdata.getParam('用气性质'))
-    this.formatArrayFun('safecheckTypeList',Vue.$appdata.getParam('安检类型'))
-    this.formatArrayFun('safecheckList',Vue.$appdata.getParam('安检类型'))
     this.searchChecker(global.login.id)
-    /*this.setProperty('checkplan','safechecktype','年度普检')*/
-    await this.Mreadibook()
-    await this.getSliceArea()
+  }
+
+  show1(){
+    this.showModel=true
   }
   //补录功能组装数据
   zzsj(){
@@ -189,44 +309,22 @@ export default class Comp {
     }
 
   }
-   readConfig () {
-    let http = new HttpResetClass()
+  readConfig () {
     http.load('GET', `/phone/rs/vue`, {}, {resolveMsg: null, rejectMsg: null}).then(res => {
       this.needconfig = res.data
-      console.log("请求得到的数据"+JSON.stringify(this.needconfig))
+      // console.log(JSON.stringify(this.needconfig))
+      // console.log("这是str1")
+      //console.log(this.needconfig.safecheck.DevicesConfig)
+      //console.log(JSON.stringify(this.needconfig.safecheck.DevicesConfig))
       let aa=this.needconfig.safecheck.DevicesConfig
+      let bb= ObjConfig.getObjConfig(this.needconfig.safecheck.DevicesConfig)
+      console.log("这是str2")
+      console.log(JSON.stringify(bb))
       this.zzsj()
     })
 
   }
-  //当前页面属性发生改变事件
-  fieldChange(modelname,value,f){
-    console.log("-------fieldChange"+value)
-    if(modelname=="user" || modelname=="checkplan" || modelname=="checkplanitems"){
-      this.setProperty(modelname,"checkername",value.name)
-      this.setProperty(modelname,"checkerid",value.id)
-      f()
-      return
-    }
-    if(modelname=="createPlan"){
-      this.newPlan.f_checker_id=value.id
-      this.newPlan.f_checker=value.name
-      f()
-      return
-    }
-    if(modelname=="upPlan"){
-      this.plan.f_checker= value.name
-      this.plan.f_checker_id=value.id
-      f()
-      return
-    }
-    if(value=='全部'){
-      this[modelname]=''
-    }else{
-      this[modelname]=value
-    }
-    f()
-  }
+  //分公司发生改变
   async orgChange(value,f){
     console.log("----orgChange"+JSON.stringify(value))
     if(value.value==this.filialeid){
@@ -237,25 +335,62 @@ export default class Comp {
     this.filialeidname=value.label
     this.user = new SearchList(true)
     this.checkplanitems = new SearchList(true)
+    this.checkplan = new SearchList(true)
     this.searchChecker(global.login.id)
-    await this.Mreadibook()
-    await this.getSliceArea()
-    await this.checkplan.searchList("/rs/sql/预约计划下发", {},{groupitem:"",f_filialeids:"("+this.filialeid+")",orderitem:"f_create_time desc"})
+    this.getAreaList()
+    this.checkplan.search.setField("safechecktype",'年度普检')
+    await this.checkplan.searchList("/api/af-safecheck/sql/预约计划下发TS", {"f_plan_name": "f_plan_name like '%{}%'",
+      "f_plan_year":"f_plan_year={}",
+      "f_plan_month":"f_plan_month={}",
+      "checkerid":"f_checker_id='{}'",
+      "isAndNot":"f_checker {}",
+      "safechecktype":"f_safecheck_type='{}'"
+    },{groupitem:"",f_filialeids:"("+this.filialeid+")",orderitem:"f_create_time desc"})
+    this.user.search.setField("f_filialeid",this.filialeid)
+    this.setProperty('user', 'userType', '民用')
     f()
   }
-  //json下拉改变时间
-  selectChanged(modelname,key,valuename,value,f){
-    console.log('value[valuename]'+modelname+key+valuename+'----'+JSON.stringify(value))
-    if(value.label=='全部' || !value){
-      this[modelname].search.setField(key, '')
-      this[modelname].search.setField(key+'name', '全部')
-    }else{
-      console.log("value[valuename]"+value[valuename])
-      this[modelname].search.setField(key, value.value)
-      this[modelname].search.setField(key+'name', value.label)
+  //当前页面属性发生改变事件
+  fieldChange(modelname,value,f){
+    console.log(value)
+    if(modelname=="user" || modelname=="checkplan" || modelname=="checkplanitems"){
+      for(let i=0;i<this.orgChecker.length;i++){
+        if(this.orgChecker[i].name==value){
+          this.setProperty(modelname,"checkername",this.orgChecker[i].name)
+          this.setProperty(modelname,"checkerid",this.orgChecker[i].id)
+          break
+        }
+      }
+      f()
+      return
+    }
+    if(modelname=="createPlan"){
+      for(let i=0;i<this.orgChecker.length;i++){
+        if(this.orgChecker[i].name==value){
+          this.newPlan.f_checker_id=this.orgChecker[i].id
+          this.newPlan.f_checker=this.orgChecker[i].name
+          break
+        }
+      }
+      console.log("查询到的安检员详细信息："+JSON.stringify(this.newPlan))
+      f()
+      return
     }
+    if(modelname=="upPlan"){
+      for(let i=0;i<this.orgChecker.length;i++){
+        if(this.orgChecker[i].name==value){
+          this.plan.f_checker= this.orgChecker[i].name
+          this.plan.f_checker_id=this.orgChecker[i].id
+          break
+        }
+      }
+      f()
+      return
+    }
+    this[modelname]=value
     f()
   }
+
   jointCondition1(field,modelname){
     for (let i =0 ;i<this[field].length;i++){
       if(!this[field][i].selectValue){
@@ -312,7 +447,6 @@ export default class Comp {
     if(sortfield){//如果传入空串说明是查询      传入非空串就是排序
       console.log("进入排序")
       if(sortfield==this.currentorder){
-        this.isSend=false
         return
       }else{
         this.currentorder=sortfield
@@ -328,22 +462,21 @@ export default class Comp {
         break
     }
     console.log("值"+sortfield+"--当前值"+this.currentorder+"---排序值："+fieldValue)
-    await this.checkplan.searchList("/rs/sql/预约计划下发",
+    await this.checkplan.searchList("/api/af-safecheck/sql/预约计划下发TS",
       {"f_plan_name": "f_plan_name like '%{}%'",
-            "f_plan_year":"f_plan_year={}",
-            "f_plan_month":"f_plan_month={}",
-            "checkerid":"f_checker_id={}",
-            "isAndNot":"f_checker {}",
-            "safechecktype":"f_safecheck_type='{}'",
-            "issude":"f_issued = '{}'"
-            },
+        "f_plan_year":"f_plan_year={}",
+        "f_plan_month":"f_plan_month={}",
+        "checkerid":"f_checker_id='{}'",
+        "isAndNot":"f_checker {}",
+        "safechecktype":"f_safecheck_type='{}'"
+      },
       {orderitem:fieldValue,
-              f_filialeids:"("+this.filialeid+")",
-              groupitem:""
-            }
+        f_filialeids:"("+this.filialeid+")",
+        groupitem:""
+      }
     )
-    //调刷新函数？？？？
-    console.log('调刷新函数？？？？--')
+    this.checkplan.check.checkAll=false
+    this.checkplan.check.checkes=[]
     f()
     this.isSend=false
   }
@@ -351,58 +484,61 @@ export default class Comp {
   // 查询待检用户
   async searchUser(f) {
     this.isSend=true
+    this.user.check.checkAll=false
     this.user.check.checkes=[]
     this.jointCondition1("conditionList","user")
     let sday=''
     let eday=''
     if(this.startday.trim()!=''){
-        if(isNaN(this.startday) || isNaN(this.endday)){
-          Vue.showMessage("请输入数字！")
-          return
-        }
-        if(this.selectTime=="月"){
-         sday= this.startday*30
-         this.endday.trim()!=''?eday= this.endday*30:eday=''
-        }else{
-          sday= this.startday
-          this.endday.trim()!=''?eday= this.endday:eday=''
-        }
-        if(eday){
-          this.setProperty("user","checkTime"," DATEDIFF(dd,ua.f_last_check_date,GETDATE())>="+parseInt(sday,10)+" and DATEDIFF(dd,ua.f_last_check_date,GETDATE())<="+parseInt(eday,10))
-        }else{
-          this.setProperty("user","checkTime"," DATEDIFF(dd,ua.f_last_check_date,GETDATE())>="+parseInt(sday,10))
-        }
+      if(isNaN(this.startday) || isNaN(this.endday)){
+        Vue.showMessage("请输入数字！")
+        return
+      }
+      if(this.selectTime=="月"){
+        sday= this.startday*30
+        this.endday.trim()!=''?eday= this.endday*30:eday=''
+      }else{
+        sday= this.startday
+        this.endday.trim()!=''?eday= this.endday:eday=''
+      }
+      if(eday){
+        this.setProperty("user","checkTime"," DATEDIFF(dd,isnull(ua.f_last_check_date,ui.f_createfile_date),GETDATE())>="+parseInt(sday,10)+" and DATEDIFF(dd,isnull(ua.f_last_check_date,ui.f_createfile_date),GETDATE())<="+parseInt(eday,10))
+      }else{
+        this.setProperty("user","checkTime"," DATEDIFF(dd,isnull(ua.f_last_check_date,ui.f_createfile_date),GETDATE())>="+parseInt(sday,10))
+      }
+
     }else{
       this.setProperty("user","checkTime","")
     }
-    if(this.yChecked=='已在计划中'){
-      this.setProperty("user","ychecked","ua.f_plan_id is not null")
-    }else if(this.yChecked=='未在计划中'){
-      this.setProperty("user","ychecked","ua.f_plan_id is null")
+    if(this.yChecked=='已检'){
+      this.setProperty("user","ychecked","DateName(year,isnull(ua.f_last_check_date,'1990-01-01'))='"+new Date().getFullYear()+"'")
+    }else if(this.yChecked=='未检'){
+      this.setProperty("user","ychecked","DateName(year,isnull(ua.f_last_check_date,'1990-01-01'))!='"+new Date().getFullYear()+"'")
     }else{
       this.setProperty("user","ychecked","")
     }
-    this.user.search.setField("f_filialeid",this.filialeid)
-    await this.user.searchList("/rs/sql/FetchUserFileByOrgNoRuHuSXQ", {
+
+    //this.user.search.setField("f_year_plan","<>")
+    await this.user.searchList("/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQTS", {
       "f_filialeid": "ui.f_filialeid={}",
       "userinfocode": "ui.f_userinfo_code='{}'",
       "username": "ui.f_user_name like '%{}%'",
       "useraddress": "ua.f_address like '%{}%'",
       "userType":"uf.f_user_type='{}'",
-      "f_residential_area":"ua.f_residential_area like '%{}%'",
+      "f_residential_area":"ua.f_residential_area = '{}'",
       "f_building":"ua.f_building='{}'",
       "f_unit":"ua.f_unit='{}'",
       "f_user_state":"ui.f_user_state='{}'",
-      "checkTime":" {}",
-      "meterbook":"uf.f_meter_book_num='{}'",
-      "user_start":" ui.f_createfile_date >='{}'",
-      "user_end":" ui.f_createfile_date <='{}'",
-      "check_start":" ua.f_last_check_date >='{}'",
-      "check_end":" ua.f_last_check_date<= '{}'",
-      "area":" f_book_slice_area ='{}'",
-      "ychecked":" {}",
-      "f_metertitles":" uf.f_metertitles='{}'",
-      "f_gasproperties":" uf.f_gasproperties='{}'"
+      "checkTime":"{}",
+      "uploadCondition":"{}",
+      "f_devices":"de.f_devices_type='{}'",
+      "f_gasproperties":"sp.f_gasproperties='{}'",
+      "f_meter_classify":"uf.f_meter_classify='{}'",
+      "f_table_state":"uf.f_table_state='{}'",
+      "f_meter_brand":"gb.f_meter_brand='{}'",
+      "f_price_type":"sp.f_price_type='{}'",
+      "f_price_name":"sp.f_price_name='{}'",
+      "ychecked":" {}"
     }, {
       "orderitem": 'f_residential_area,f_building,f_unit,f_floor,f_room',
       "f_usertype": '',
@@ -410,38 +546,66 @@ export default class Comp {
       "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
       "SafeCheckCQ": '',
       "startday":"",
-      "endday":""
+      "f_plan_year":new Date().getFullYear()
     })
     f()
     this.isSend=false
   }
 
+//限制用户购气
+  LimitBuyGas(){
+
+  }
+
+  planIsChecked(issude,count) {
+    if (issude == '未下发') {
+      return true
+    }
+    if(count == 0){
+      return true
+    }
+    return false
+  }
+  //查询安检员
+  /*  searchChecker(id){
+      new HttpResetClass().load('POST', '/rs/search', {
+        source:  'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($state$)==$在职$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+        userid: id
+      }, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+       this.checker=res.data
+       console.log("安检员列表---"+JSON.stringify(res)+"---id"+this.filialeid)
+     })
+
+    }*/
+
   //查询安检员selectChanged
   async searchChecker(id){
-   let res=await this.http.load('POST', '/rs/search', {
+    let res=await this.http.load('POST', '/rs/search', {
       source: 'tool.getChildrenOfResName($安检员$)',
       userid: id
     }, {resolveMsg: null, rejectMsg: null})
     this.checker=[]
+    this.orgChecker=[]
     res.data.forEach((resRow) => {
       if(resRow.orgid==this.filialeid){
-        this.checker.push(resRow)
+        this.checker.push(resRow.name)
+        this.orgChecker.push(resRow)
       }
     })
     console.log("安检员列表---"+JSON.stringify(res)+"---id"+this.filialeid)
   }
 
   async searchPlanItems(f) {
-    await this.checkplanitems.searchList("/rs/sql/planItem", {"f_plan_id": "f_plan_id={}"}, {})
+    await this.checkplanitems.searchList("/api/af-safecheck/sql/planItemTS", {"f_plan_id": "f_plan_id={}"}, {})
     f()
   }
   //得到更新数据
-    async getPaper(id,f) {
-      let res=await this.http.load("POST", "/rs/path/getUserinfomation", {
-       data:{
-         condition:"f_check_item_id='"+id+"'"
-       }
-      })
+  async getPaper(id,f) {
+    let res=await this.http.load("POST", "/rs/path/getUserinfomation", {
+      data:{
+        condition:"f_check_item_id='"+id+"'"
+      }
+    })
 
 
     this.suppplanitem=res.data[0]
@@ -452,20 +616,20 @@ export default class Comp {
 
     if(this.suppplanitem.f_devices.length!=0){
 
-    for (let i = 0; i <this.str.length ; i++) {
-      if (this.suppplanitem.f_devices[i]==undefined) {
-        this.fdevices.push({
-          f_device_type: this.str[i].checkname,
-          f_items: []
-          //id: this.suppplanitem.f_devices[i] == undefined ? "" : this.suppplanitem.f_devices[i].id
-        })
-      }else {
-        this.fdevices.push({
-          f_device_type: this.str[i].checkname,
-          f_items: [],
-          id:this.suppplanitem.f_devices[i].id
-        })
-      }
+      for (let i = 0; i <this.str.length ; i++) {
+        if (this.suppplanitem.f_devices[i]==undefined) {
+          this.fdevices.push({
+            f_device_type: this.str[i].checkname,
+            f_items: []
+            //id: this.suppplanitem.f_devices[i] == undefined ? "" : this.suppplanitem.f_devices[i].id
+          })
+        }else {
+          this.fdevices.push({
+            f_device_type: this.str[i].checkname,
+            f_items: [],
+            id:this.suppplanitem.f_devices[i].id
+          })
+        }
       }
     }else{for (let i = 0; i <this.str.length ; i++) {
 
@@ -477,82 +641,40 @@ export default class Comp {
 
 
 
-    }
+  }
 
 //补录时改变fdevice
   suppfdevice(){
     for (let i = 0; i <this.str.length ; i++) {
       this.fdevices.push({f_device_type:this.str[i].checkname,f_items:[]})
     }
-    console.log("supp最后的listbutton"+JSON.stringify(this.listbutton))
-    this.changeListButton()
-  }
-  //改变数组的样式
-  changeListButton(){
-    let listarray=[]
-    for (let i = 0; i < this.listbutton.length; i++) {
-      if (!this.listbutton[i].mname){
-        console.log("这是"+this.listbutton[i].lname.length)
-        listarray.push(this.listbutton[i])
-        listarray.push({"lname":"","type":"","mname":"","selected":"","level":"","isdefect":""})
-        listarray.push({"lname":"","type":"","mname":"","selected":"","level":"","isdefect":""})
-        listarray.push({"lname":"","type":"","mname":"","selected":"","level":"","isdefect":""})
-        let count=0
-        for (let j = 0; j < this.listbutton.length; j++) {
-          if(this.listbutton[i].lname.substring(0,this.listbutton[i].lname.length-1)==this.listbutton[j].mname){
-
-            listarray.push(this.listbutton[j])
-            count++
-          }
-        }
-        if (count%4!=0){
-          for (let j = 0; j <4-count%4; j++) {
-            listarray.push({"lname":"","type":"","mname":"","selected":"","level":"","isdefect":""})
-          }
-        }
-      }
-    }
-    console.log("需要的数据"+JSON.stringify(listarray))
-    this.listbutton=listarray
-    this.tranlistbutton()
-  }
-//横向分开list
-  tranlistbutton(){
-    console.log("jinru111111111111")
-    for (let i = 0; i < this.listbutton.length; i++) {
-      if((i+1)%4==1){
-        this.listbuttona.push(this.listbutton[i])
-      }else if((i+1)%4==2){
-        this.listbuttonb.push(this.listbutton[i])
-      }else if((i+1)%4==3){
-        this.listbuttonc.push(this.listbutton[i])
-      }else if((i+1)%4==0){
-        this.listbuttond.push(this.listbutton[i])
-      }
-    }
   }
+
+
   // 打开安检计划，加载安检计划的所有安检单
   async openPlan(plan, f) {
     this.isSend=true
     this.checkplanitems.check.checkes=[]
-    this.SelectedPlan=plan.id
+    this.checkplanitems.check.checkAll=false
+    this.SelectedPlan=plan
     this.plan=plan
     this.checkplanitems.search.setField("f_plan_id", plan.id)
     this.checkplanitems.search.setField("f_state", "作废")
-    await this.checkplanitems.searchList("/rs/sql/planItem", {"f_plan_id": "i.f_plan_id='{}'","f_state": "i.f_state !='{}'"}, {})
+    await this.checkplanitems.searchList("/api/af-safecheck/sql/planItemTS", {"f_plan_id": "i.f_plan_id='{}'","f_state": "i.f_state !='{}'"}, {})
     f()
-    //this.checkplanitems.search.model.f_plan_id
     this.isSend=false
+    //this.checkplanitems.search.model.f_plan_id
   }
 
   //根据条件查询某个安检计划下的安检单
   async searchPlanItem(f) {
     this.checkplanitems.check.checkes=[]
+    this.checkplanitems.check.checkAll=false
     if(this.checkplanitems.search.model.f_plan_id){
       this.isSend=true
       console.log("进入加载安检计划项"+this.checkplanitems.search.model.f_plan_id)
       this.jointCondition1("planitemconditionList","checkplanitems")
-      await this.checkplanitems.searchList("/rs/sql/planItem",
+      await this.checkplanitems.searchList("/api/af-safecheck/sql/planItemTS",
         {"f_plan_id": "i.f_plan_id='{}'",
           "usercode": "i.f_userinfo_code='{}'",
           "username": "i.f_user_name='{}'",
@@ -562,7 +684,8 @@ export default class Comp {
           "f_end_time": "i.f_last_check_date  <='{}'",
           "f_last_check_result":"i.f_last_check_result like '%{}%'",
           "f_state": "i.f_state !='{}'",
-          "f_state1": "i.f_state ='{}'"
+          "f_state1": "i.f_state ='{}'",
+          "f_area":"i.f_residential_area='{}'"
         },
         {})
       f()
@@ -574,8 +697,8 @@ export default class Comp {
 //加载更多数据
   async loadMore(modelname,f) {
     this.isSend=true
-      await this[modelname].list.loadMore()
-      f()
+    await this[modelname].list.loadMore()
+    f()
     this.isSend=false
   }
 
@@ -588,54 +711,26 @@ export default class Comp {
   //当选中列表中某项时触发
   addParam(modulename, id) {
     console.log("当前值"+modulename+"--------"+id)
-      this[modulename].check.setCheckes(id)
+    this[modulename].check.setCheckes(id)
   }
-
-  //设置属性值
-  setProperty(modulename, property, value,f) {
-
-    console.log(modulename+"新添--"+property+"--"+value)
-   if(property=='area'){
-     this.selectChanged("user","meterbook","","",f)
-      if(value=='全部'){
-        this[modulename].search.setField(property, '')
-        this.cbc=[]
-        this.meterbooks.forEach((res) => {
-            this.cbc.push({label: res.f_book_name, value: res.id})
-          /*if(res.f_book_slice_area){
-            if(this.sliceArea.indexOf(res.f_book_slice_area)<0){
-              this.sliceArea.push(res.f_book_slice_area)
-            }
-          }*/
-        })
-        f()
-        return
-      }
-      this[modulename].search.setField(property, value)
-      this.cbc=[]
-      this.meterbooks.forEach((res) => {
-        if(res.f_book_slice_area==value){
-          this.cbc.push({label: res.f_book_name, value: res.id})
-        }
-
-        /*if(res.f_book_slice_area){
-          if(this.sliceArea.indexOf(res.f_book_slice_area)<0){
-            this.sliceArea.push(res.f_book_slice_area)
-          }
-        }*/
-      })
-      f()
-    }else if(value=='全部'){
-      this[modulename].search.setField(property, '')
+  selectChanged(modulename, property, value,f){
+    if(value=='全部'){
+      this.setProperty(modulename, property, '')
     }else{
-      this[modulename].search.setField(property, value)
+      this.setProperty(modulename, property, value)
     }
+    f()
+  }
+  //设置属性值
+  setProperty(modulename, property, value) {
+    console.log(modulename+"新添--"+property+"--"+value)
+    this[modulename].search.setField(property, value)
   }
 
   //列表中的选择框是否被选中
   hasValue(modulename,value){
     this[modulename].check.checks.has()
-}
+  }
   // 给新建安检计划设置属性值
   setNewPlan(property, value) {
     console.log(value)
@@ -646,19 +741,39 @@ export default class Comp {
   //dragParam：从拖动的起始位置传入的参数
   async dragtoPlan(f_plan_id,f_safecheck_type,f_filialeid,dragParam,f){
     console.log("当前传入："+dragParam)
-      await this.dragtoPlanItem(f_plan_id,f_safecheck_type,dragParam,f)
-      await this.dragtoOtherPlanIteem(f_plan_id,dragParam,f)
+    await this.dragtoPlanItem(f_plan_id,f_safecheck_type,dragParam,f)
+    await this.dragtoOtherPlanIteem(f_plan_id,dragParam,f)
   }
 
   //将客户信息拖至计划中
   async dragtoPlanItem(f_plan_id,f_safecheck_type,dragParam,f) {
-
+    if (this.SelectedPlan.f_plan_year < new Date().getFullYear()) {
+      return  Vue.showMessage("禁止给今年之前的计划添加新用户!")
+    }
+    let url=''
     console.log("计划id："+f_plan_id+"公司id："+this.filialeid)
     if(dragParam=='user'){
+      if(!this.user.check.checkAll && this.user.check.checkes.length==0){
+        Vue.showMessage("请选择用户后再进行添加！")
+        return
+      }
       this.jointCondition("user")
+      if(this.user.search.model.userType){
+        if(this.user.search.model.userType=='民用'){
+          url="/api/af-safecheck/logic/AddCheckPlanItemTS"
+        }else if(this.user.search.model.userType=='非民用'){
+          url="/api/af-safecheck/logic/AddCheckPlanItemCivilTS"
+        }else{
+          Vue.showMessage("用户类型数据异常，请联系管理员！")
+          return
+        }
+      }else{
+        Vue.showMessage("请选择用户类型后！在进行计划下派操作")
+        return
+      }
       if(this.checkplanitems.search.model.f_plan_id){
         this.isSend=true
-        let res=await this.http.load("POST", "/rs/logic/AddCheckPlanItem", {
+        let res=await this.http.load("POST", url, {
           data:{
             f_operator:global.login.name,
             f_plan_id:f_plan_id,
@@ -671,33 +786,38 @@ export default class Comp {
               "username": "ui.f_user_name like '%{}%'",
               "useraddress": "ua.f_address like '%{}%'",
               "userType":"uf.f_user_type='{}'",
-              "f_residential_area":"ua.f_residential_area like '%{}%'",
+              "f_residential_area":"ua.f_residential_area = '{}'",
               "f_building":"ua.f_building='{}'",
               "f_unit":"ua.f_unit='{}'",
               "f_user_state":"ui.f_user_state='{}'",
-              "checkTime":" {}",
-              "meterbook":"uf.f_meter_book_num='{}'",
-              "user_start":" ui.f_createfile_date >='{}'",
-              "user_end":" ui.f_createfile_date <='{}'",
-              "check_start":" ua.f_last_check_date >='{}'",
-              "check_end":" ua.f_last_check_date<= '{}'",
-              "area":" ua.f_slice_area='{}'",
-              "ychecked":" {}",
-              "f_metertitles":" uf.f_metertitles='{}'",
-              "f_gasproperties":" uf.f_gasproperties='{}'"
+              "checkTime":"{}",
+              "uploadCondition":"{}",
+              "f_devices":"de.f_devices_type='{}'",
+              "f_gasproperties":"sp.f_gasproperties='{}'",
+              "f_meter_classify":"uf.f_meter_classify='{}'",
+              "f_table_state":"uf.f_table_state='{}'",
+              "f_meter_brand":"gb.f_meter_brand='{}'",
+              "f_price_type":"sp.f_price_type='{}'",
+              "f_price_name":"sp.f_price_name='{}'",
+              "ychecked":" {}"
             }),
             switchCheckAll:this.user.check.switchCheckAll,
             checkAll:this.user.check.checkAll,
             param:this.user.check.checkes,
-            columnName: "ua.id"
+            columnName: "ua.id",
+            f_plan_year:new Date().getFullYear()
           }
         }, {resolveMsg: null, rejectMsg: null})
         console.log("重复数量-"+JSON.stringify(res.data.result)+"---"+res.data.result.length)
         if(res.data.code==200){
           //alert("添加成功！有"+res.data.result.length+"条用户地址已经存在于其他计划中:  \n"+res.data.result.reduce((c,v)=>{c += v.f_user_name+":"+v.f_address+"\n"}),0)
-          Vue.showMessage("添加成功！"+(res.data.result.length>0?"有"+res.data.result.length+"条用户地址已经存在于其他计划中":""))
+          Vue.showMessage("本次添加成功"+res.data.resultno[0].con+'户！'+(res.data.result.length>0?"另有"+res.data.result.length+"条用户地址已经存在于其他计划中":""))
         }else{
-          Vue.showMessage("添加失败！")
+          if (res.data.msg) {
+            Vue.showMessage(res.data.msg)
+          } else {
+            Vue.showMessage("添加失败！")
+          }
         }
         this.user.check.checkes=[]
         await this.searchUser(()=>{})
@@ -713,9 +833,10 @@ export default class Comp {
 
   //将某个计划下的一项拖到另一个计划
   async dragtoOtherPlanIteem(checkplanid,dragParam,f) {
-    if(dragParam=='item'){
+
+    /*if(dragParam=='item'){
       this.isSend=true
-      let res=await this.http.load("POST", "/rs/logic/UpCheckPlanItem", {
+      let res=await this.http.load("POST", "/api/af-safecheck/logic/UpCheckPlanItem", {
         data:{
           f_operator:global.login.name,
           f_plan_id:checkplanid,
@@ -727,8 +848,9 @@ export default class Comp {
             "f_start_time": "i.f_last_check_date >='{}'",
             "f_end_time": "i.f_last_check_date  <='{}'",
             "f_last_check_result":"i.f_last_check_result like '%{}%'",
+            "f_state1": "i.f_state ='{}'",
             "f_state": "i.f_state !='{}'",
-            "f_state1": "i.f_state ='{}'"
+            "f_area":"i.f_residential_area='{}'"
           }),
           switchCheckAll:this.checkplanitems.check.switchCheckAll,
           checkAll:this.checkplanitems.check.checkAll,
@@ -747,54 +869,61 @@ export default class Comp {
       }
       f()
       this.isSend=false
-    }
+    }*/
 
   }
-
+  //清空用户编号
+  clearUserInfoId(){
+    this.setProperty("user","uploadCondition",'')
+    Vue.showMessage("已清空用户编号")
+  }
   //修改计划项状态为作废
   async delPlanItem(dragParam,f) {
     console.log("进入作废计划项方法")
-    if(dragParam=='item'){
-      Vue.showMessage("此操作无法撤回,确定要执行作废安检单操作吗？",['confirm','cancel']).then((button)=>{
-        if(button=='confirm'){
-          this.isSend=true
-          let resu=this.http.load("POST", "/rs/logic/UpCheckPlanItemState", {
-            data: {
-              f_operator:global.login.name,
-              condition:this.checkplanitems.search.search({"f_plan_id": "i.f_plan_id='{}'",
-                "usercode": "i.f_userinfo_code='{}'",
-                "username": "i.f_user_name='{}'",
-                "f_address": "i.f_address like '%{}%'",
-                "f_last_check_state": "i.f_last_check_state='{}' ",
-                "f_start_time": "i.f_last_check_date >='{}'",
-                "f_end_time": "i.f_last_check_date  <='{}'",
-                "f_last_check_result":"i.f_last_check_result like '%{}%'",
-                "f_state": "i.f_state !='{}'",
-                "f_state1": "i.f_state ='{}'"
-              }),
-              switchCheckAll:this.checkplanitems.check.switchCheckAll,
-              checkAll:this.checkplanitems.check.checkAll,
-              param:this.checkplanitems.check.checkes,
-              columnName: "i.id"
-            }
-          }, {resolveMsg: null, rejectMsg: null}).then((resu)=>{
-
-            console.log("-----------"+JSON.stringify(resu.data))
-            if(resu.data.code==200){
-              Vue.showMessage("移除安检单成功! 成功移除:"+resu.data.res.up+"条"+(resu.data.res.noup>0?"有"+resu.data.res.noup+"条已经不是 ‘未检’ 状态！":""))
-              this.searchUser(f)
-              this.searchPlanItem(f)
-              this.loadCheckPlan("",f)
-            }else{
-              Vue.showMessage("取消安检计划失败!")
-            }
-            this.isSend=false
-          })
 
+    if(dragParam=='item'){
+      if(this.SelectedPlan.f_issued=='已下发'
+        && global.login.rolestr.indexOf("大区总经理")==-1
+        && global.login.rolestr.indexOf("集团管理员")==-1
+        && global.login.rolestr.indexOf("华东大区管理员")==-1
+        && global.login.rolestr.indexOf("大区管理员")==-1
+      ){
+        Vue.showMessage("已下发计划无法删除用户！")
+        return
+      }
+      this.isSend=true
+      let resu=await this.http.load("POST", "/api/af-safecheck/logic/UpCheckPlanItemStateTS", {
+        data: {
+          f_operator:global.login.name,
+          condition:this.checkplanitems.search.search({"f_plan_id": "i.f_plan_id='{}'",
+            "usercode": "i.f_userinfo_code='{}'",
+            "username": "i.f_user_name='{}'",
+            "f_address": "i.f_address like '%{}%'",
+            "f_last_check_state": "i.f_last_check_state='{}' ",
+            "f_start_time": "i.f_last_check_date >='{}'",
+            "f_end_time": "i.f_last_check_date  <='{}'",
+            "f_last_check_result":"i.f_last_check_result like '%{}%'",
+            "f_state": "i.f_state !='{}'",
+            "f_state1": "i.f_state ='{}'",
+            "f_area":"i.f_residential_area='{}'"
+          }),
+          switchCheckAll:this.checkplanitems.check.switchCheckAll,
+          checkAll:this.checkplanitems.check.checkAll,
+          param:this.checkplanitems.check.checkes,
+          columnName: "i.id"
         }
-
-      })
-
+      }, {resolveMsg: null, rejectMsg: null})
+      console.log("-----------"+JSON.stringify(resu.data))
+      if(resu.data.code==200){
+        Vue.showMessage("作废安检单成功! 成功作废:"+resu.data.res.up+"条"+(resu.data.res.noup>0?"有"+resu.data.res.noup+"条已经不是 ‘未检’ 状态！":""))
+        await this.searchUser(()=>{})
+        await this.searchPlanItem(()=>{})
+        await this.loadCheckPlan("",()=>{})
+        f()
+      }else{
+        Vue.showMessage("取消安检计划失败!")
+      }
+      this.isSend=false
     }
 
   }
@@ -805,40 +934,75 @@ export default class Comp {
       return
     }
     this.isSend=true
-    let res=await this.http.load("POST","/rs/sql/getCheckplan", {data: {condition:"f_plan_name='"+this.newPlan.f_plan_name+"'",sortfield:'f_create_time desc'}})
-    console.log("结果-"+res.data.length)
-    if(res.data.length>0){
-      Vue.showMessage("计划名称不能重复！")
-      this.isSend=false
-      return
-    }
+    /*if(this.newPlan.f_safecheck_type=='散户安检'){
+      let res=await this.http.load("POST","/api/af-safecheck/sql/getCheckplan", {data: {condition:`f_plan_year='${this.newPlan.f_plan_year}' and f_plan_month='${this.newPlan.f_plan_month}' and f_checker_id='${this.newPlan.f_checker_id}' and f_safecheck_type='${this.newPlan.f_safecheck_type}'`,sortfield:'f_create_time desc'}}, {resolveMsg: null, rejectMsg: null})
+      console.log("结果-"+res.data.length)
+      if(res.data.length>0){
+        Vue.showMessage("当月已生成该安检员的散户计划，无法再次生成！")
+        this.isSend=false
+        return
+      }else{
+        this.newPlan.f_plan_name=this.newPlan.f_plan_year+"年"+this.newPlan.f_plan_month+"月散户计划"
+      }
+    }*/
+
     if(this.isShare=="是"){
       this.newPlan.f_checker_id=null
       this.newPlan.f_checker=null
     }
+    let d1=new Date()
+    this.newPlan.f_plan_name=d1.getFullYear()+'年'+(d1.getMonth()+1)+'月'+this.newPlan.f_plan_name+'年度普检计划'
     this.newPlan.f_plan_type='预约计划'
     this.newPlan.f_subcompany=global.login.orgs
     this.newPlan.f_filialeid=this.filialeid
     this.newPlan.f_create_operator=global.login.name
     this.newPlan.f_create_time=this.getNowFormatDate()
-    await Vue.resetpost("/rs/logic/createCheckPlan", {"data": this.newPlan},{resolveMsg : '新建计划成功！', rejectMsg : '新建计划失败！'})
-    //await this.loadCheckPlan('',()=>{})
-    this.newPlan={f_issued:"否"}
-    this.isShare="否"
+    await Vue.resetpost("/api/af-safecheck/logic/createCheckPlanTS", {"data": this.newPlan},{resolveMsg : '新建计划成功！', rejectMsg : '新建计划失败！'},2500)
     await this.loadCheckPlan('',()=>{})
+    this.newPlan={f_issued:"否",f_safecheck_type:"年度普检"}
+    this.isShare="否"
     f()
     window.dispatchEvent(new CustomEvent("goRefresh"),{})
     this.isSend=false
-
   }
 
   // 取消新建安检计划
   cancel() {
-    this.newPlan={f_issued:"否"}
+    this.newPlan={f_issued:"否",f_safecheck_type:"年度普检"}
     this.isShare="否"
     this.plan={}
   }
 
+  //获取安检计划中已办数量，除去所有未办的，都算已办
+  /*getChecked(plan) {
+    //console.log("加载已办数量"+JSON.stringify(plan))
+    return this.sum(plan.f_items,'f_state', 'num', ['已检', '作废'])
+  }
+
+  //获取安检计划未检数量
+  getNotChecked(plan) {
+    //console.log("加载未检数量"+JSON.stringify(plan))
+    return this.sum(plan.f_items,'f_state', 'num', ['未检'])
+  }
+
+  // 获取总数
+  getSumItem(plan) {
+    //console.log("加载总数量"+JSON.stringify(plan))
+    return this.sum(plan.f_items,'f_state', 'num', ['未检', '已检', '作废'])
+  }
+
+  sum(arr,keyName, sumName, keys) {
+    return arr.reduce(function(prev, curr, idx, arr){
+      // 如果求和主键包括当前主键，进行累加，否则，不累加
+      if (keys.find(function(v) {
+        return v === curr[keyName]
+      })) {
+        return prev + curr[sumName];
+      } else {
+        return prev
+      }
+    }, 0)
+  }*/
   // 取年的选择项目
   years() {
     return date.yearSelects
@@ -958,7 +1122,7 @@ export default class Comp {
       }
     }
 
-console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
+
   }
   //返回遍历的option
   reoption(key1,key2){
@@ -981,7 +1145,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       return
     }
     this.isSend=true
-    let res=await this.http.load("POST", "/rs/logic/NewBespeakCheckPlan", {
+    let res=await this.http.load("POST", "/api/af-safecheck/logic/NewBespeakCheckPlanTS", {
       data:{
         f_issued:'是',
         f_issue_time:this.getNowFormatDate(),
@@ -1007,7 +1171,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       return
     }
     this.isSend=true
-    let res=await this.http.load("POST", "/rs/logic/deleteCheckPlan", {
+    let res=await this.http.load("POST", "/api/af-safecheck/logic/deleteCheckPlanTS", {
       data:{
         f_operator:global.login.name,//global.login.name,
         condition:this.checkplan.search.search({}),
@@ -1017,16 +1181,16 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
         columnName: "f_plan_id"
       }
     }, {resolveMsg: "删除成功！", rejectMsg: "删除失败！"})
-      console.log(JSON.stringify(res))
+    console.log(JSON.stringify(res))
     if(res.data.code==200){
-      Vue.showMessage("删除成功！"+res.data.message,"success",2500)
+      Vue.showAlert("删除成功！","success",2500)
       await  this.loadCheckPlan('',()=>{})
     }else{
-      Vue.showMessage("删除失败！"+res.data.message,"success",2500)
+      Vue.showAlert("删除失败！","success",2500)
     }
-      this.checkplanitems.search.model.f_plan_id=""
-      this.checkplanitems.list.data=[]
-      f()
+    this.checkplanitems.search.model.f_plan_id=""
+    this.checkplanitems.list.data=[]
+    f()
     this.isSend=false
   }
   //修改计划时 用来存储当前选中要修改的计划
@@ -1051,7 +1215,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       return
     }
     this.isSend=true
-    let res=await this.http.load("POST", "/rs/logic/updateCheckPlan", {
+    let res=await this.http.load("POST", "/api/af-safecheck/logic/updateCheckPlanTS", {
       data:{
         f_checker:this.plan.f_checker,
         f_checker_id:this.plan.f_checker_id,
@@ -1062,26 +1226,29 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       }
     }, {resolveMsg: null, rejectMsg: null})
     if(res.data.code==200){
-      Vue.showMessage("修改成功！"+res.data.message,"success",2500)
+      Vue.showAlert("修改成功！"+res.data.message,"success",2500)
       await  this.loadCheckPlan('',()=>{})
     }else{
-      Vue.showMessage("修改失败！"+res.data.message,"success",2500)
+      Vue.showAlert("修改失败！"+res.data.message,"success",2500)
     }
     f()
+    window.dispatchEvent(new CustomEvent("goRefresh"),{})
     this.isSend=false
   }
 
-/*  getDataLength(modelname){
-    console.log("sdadasdasdasdadasdadddddddddddddddddddddddddddddddddddddddddddd")
-    let l=this[modelname].list.data.length
-    console.log("--"+l)
-    return l
-  }*/
+  /*  getDataLength(modelname){
+      console.log("sdadasdasdasdadasdadddddddddddddddddddddddddddddddddddddddddddd")
+      let l=this[modelname].list.data.length
+      console.log("--"+l)
+      return l
+    }*/
   //新建安检计划非空判断
   validationCreatePlan(){
-    if(!this.newPlan.f_plan_name){
-      Vue.showMessage("请输入安检计划名称！")
-      return false
+    if(this.newPlan.f_safecheck_type!='散户安检'){
+      if(!this.newPlan.f_plan_name){
+        Vue.showMessage("请输入安检计划名称！")
+        return false
+      }
     }
     if(!this.newPlan.f_plan_year){
       Vue.showMessage("请选择安检年份！")
@@ -1103,6 +1270,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       Vue.showMessage("请选择安检类型！")
       return false
     }
+
     return true
   }
 
@@ -1111,49 +1279,29 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
     this.setFdevices()
     this.setfDevicesid()
     //return;
-      for (var i = 0; i <this.checkerMess.length ; i++) {
-        if (this.checkerMess[i].name==this.suppplanitem.f_checker_name){
-          this.suppplanitem["f_checker_id"]=this.checkerMess[i].id
-        }
+    for (var i = 0; i <this.checkerMess.length ; i++) {
+      if (this.checkerMess[i].name==this.suppplanitem.f_checker_name){
+        this.suppplanitem["f_checker_id"]=this.checkerMess[i].id
       }
-      //console.log(this.fdevices)
+    }
+    //console.log(this.fdevices)
     //return;
-      this.suppplanitem["f_devices"]=this.fdevices
-      this.suppplanitem.f_check_type=this.suppplanitem.f_user_type
-      this.suppplanitem.f_state = "已检"
-      this.suppplanitem.f_approved = "未审核"
-      this.suppplanitem.f_complete  = "已完成"
-      this.suppplanitem.f_no_checkplan ="有计划安检"
-      //return;
-      this.suppplanitem.f_check_plan_id=this.suppplanitem.f_plan_id
+    this.suppplanitem["f_devices"]=this.fdevices
+    this.suppplanitem.f_check_type=this.suppplanitem.f_user_type
+    this.suppplanitem.f_state = "已检"
+    this.suppplanitem.f_approved = "未审核"
+    this.suppplanitem.f_complete  = "已完成"
+    this.suppplanitem.f_no_checkplan ="有计划安检"
+    //return;
+    this.suppplanitem.f_check_plan_id=this.suppplanitem.f_plan_id
 
-    let res=await this.http.load("POST", "/rs/logic/SuppCheckPaper", {data:{paper:this.suppplanitem}})
+    let res=await this.http.load("POST", "/api/af-safecheck/logic/SuppCheckPaper", {data:{paper:this.suppplanitem}})
 
     this.openPlan(this.plan,f)
     f()
-    window.dispatchEvent(new CustomEvent("goRefresh"),{})
   }
   addnewPaper(f){
-      delete this.suppplanitem.id
-    if(!this.suppplanitem.f_onsite_time){
-      Vue.showMessage("提交失败,请输入开始时间！")
-      return false
-    }
-    if(!this.suppplanitem.f_offsite_time){
-      Vue.showMessage("提交失败,请输入结束时间！")
-      return false
-    }
-    if(!this.suppplanitem.f_entry_status){
-      Vue.showMessage("提交失败,请输入入户状态！")
-      return false
-    }
-    if(!this.suppplanitem.f_usegas&&this.suppplanitem.f_entry_status=='入户'){
-      Vue.showMessage("提交失败,请输入燃气使用状态！")
-      return false
-    }
-    // if(!this.suppplanitem.f_checker_name){
-    //   Vue.showMessage("提交失败,请输入安检员！")
-    // }
+    delete this.suppplanitem.id
     this.addNewPaper(f)
   }
   updatePaper(f){
@@ -1200,9 +1348,9 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
         for (let j = 0; j <fde.length; j++) {
           if (suppf[i].f_device_type==fde[j].f_device_type){
             for (let k = 0; k <suppf[i].f_items.length ; k++) {
-             // console.log("789456123")
+              // console.log("789456123")
               for (let l = 0; l <fde[j].f_items.length ; l++) {
-               // console.log("11111111111111")
+                // console.log("11111111111111")
                 if (suppf[i].f_items[k].f_item_name==fde[j].f_items[l].f_item_name) {
                   fde[j].f_items[l]["id"]=suppf[i].f_items[k].id
                   if (suppf[i].f_items[k].f_item_lists.length!=0){
@@ -1249,25 +1397,27 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
     }
 //console.log(this.fdevices)
   }
-  getAreaList() {
-    let res = this.http.load('POST', '/rs/sql/safe_singleTable_GroupBy', {
+  async getAreaList() {
+    let res =await new HttpResetClass().load('POST', '/api/af-safecheck/logic/safe_singleTable_GroupBy', {
       data: {
         items: 'f_residential_area',
         tablename: 't_area',
         condition: 'f_filialeid = '+this.filialeid,
         groupitem: 'f_residential_area'
       }
-    }, {resolveMsg: null, rejectMsg: null}).then((res)=>{
-      if (res.data) {
-        let arr=[]
-        for(let i =0 ;i<res.data.length;i++){
-          arr.push(res.data[i].f_residential_area)
-        }
-        this.conditionJson[0].options=arr
+    }, {resolveMsg: null, rejectMsg: null})
+    if (res.data) {
+      let arr=['全部']
+      this.areaList=res.data
+      for(let i =0 ;i<res.data.length;i++){
+        arr.push(res.data[i].f_residential_area)
       }
-    })
+      //this.conditionJson[0].options=arr
+      this.residential_area=arr
+    }
 
   }
+
 //获取当前时间
   getNowFormatDate() {
     let date = new Date();
@@ -1298,34 +1448,87 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       + seperator2 + second;
     return currentdate;
   }
+//获取安检人员
+  async getGasMan(){
+
+    let http = new HttpResetClass()
+    let getGasman = await http.load('POST', '/rs/search', {
+      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+      userid: global.login.id
+    }, {resolveMsg: null, rejectMsg: null})
+
+    this.checkerMess=getGasman.data
+    for (var i = 0; i <getGasman.data.length ; i++) {
+      this.checkersname.push(getGasman.data[i].name)
+    }
+
+  }
+  async getOrgs(){
+    let http = new HttpResetClass()
+    let orgs = await http.load('POST', '/rs/search', {
+      source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $organization$)',
+      userid: global.login.id
+      //userid:"15130"
+    }, {resolveMsg: null, rejectMsg: '获取分公司出错！！！'})
+    console.log("分公司--"+JSON.stringify(orgs))
+    this.orgs = []
+    if(orgs.data.length>0){
+      orgs.data.forEach((res) => {
+        this.orgs.push({label: res.name, value: res.id})
+      })
+    }else{
+      this.orgs.push({label: this.filialeidname, value:this.filialeid})
+      // this.orgs.push({label: '测试公司', value:222})
+    }
+
+
+  }
+
   //excel导出
   async exportFile(){
-    if(!this.checkplanitems.search.model.f_plan_id){
-      Vue.showMessage("请选择先打开一个安检计划！")
+    if(this.user.list.data.length==0){
+      Vue.showMessage("未检测到要导出的用户，请检查条件！")
       return
     }
     this.isSend=true
-    this.jointCondition1("planitemconditionList","checkplanitems")
-    let res=await this.http.load('POST','rs/logic/SafeExportExcel',
+    //this.jointCondition1("planitemconditionList","checkplanitems")
+    let res=await this.http.load('POST','api/af-safecheck/logic/exportfile',
       {
         "data": {
           "body": {
             "data": {
-              "condition": this.checkplanitems.search.search({"f_plan_id": "i.f_plan_id='{}'",
-                "usercode": "i.f_userinfo_code='{}'",
-                "username": "i.f_user_name='{}'",
-                "f_address": "i.f_address like '%{}%'",
-                "f_last_check_state": "i.f_last_check_state='{}' ",
-                "f_start_time": "i.f_last_check_date >='{}'",
-                "f_end_time": "i.f_last_check_date  <='{}'",
-                "f_last_check_result":"i.f_last_check_result like '%{}%'",
-                "f_state": "i.f_state !='{}'",
-                "f_state1": "i.f_state ='{}'"
-              })
+              "condition": this.user.search.search({
+                "f_filialeid": "ui.f_filialeid={}",
+                "userinfocode": "ui.f_userinfo_code='{}'",
+                "username": "ui.f_user_name like '%{}%'",
+                "useraddress": "ua.f_address like '%{}%'",
+                "userType":"uf.f_user_type='{}'",
+                "f_residential_area":"ua.f_residential_area = '{}'",
+                "f_building":"ua.f_building='{}'",
+                "f_unit":"ua.f_unit='{}'",
+                "f_user_state":"ui.f_user_state='{}'",
+                "checkTime":"{}",
+                "uploadCondition":"{}",
+                "f_devices":"de.f_devices_type='{}'",
+                "f_gasproperties":"sp.f_gasproperties='{}'",
+                "f_meter_classify":"uf.f_meter_classify='{}'",
+                "f_table_state":"uf.f_table_state='{}'",
+                "f_meter_brand":"gb.f_meter_brand='{}'",
+                "f_price_type":"sp.f_price_type='{}'",
+                "f_price_name":"sp.f_price_name='{}'",
+                "ychecked":" {}"
+              }),
+              "orderitem": 'f_residential_area,f_building,f_unit,f_floor,f_room',
+              "f_usertype": '',
+              "month": '',
+              "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
+              "SafeCheckCQ": '',
+              "startday":"",
+              "f_plan_year":new Date().getFullYear()
             },
-            "field": ["f_userinfo_code:用户编号","f_user_name:用户名称", "f_user_type:用户类型", "f_residential_area:小区名称", "f_state:安检状态","f_address:详细地址","f_user_phone:用户电话"],
-            "templateName": this.plan.f_plan_name,
-            "sqlName": "planItem"
+            "field": ["f_userinfo_code:用户编号","f_user_name:用户名称", "f_user_type:用户类型","f_user_phone:用户电话","f_residential_area:小区名称","f_last_check_date:最后一次安检时间","f_last_check_state:最后一次安检状态","f_address:详细地址"],
+            "templateName": '用户安检情况',
+            "sqlName": "FetchUserFileByOrgNoRuHuSXQTS"
           },
         }
       }
@@ -1342,77 +1545,6 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
     this.isSend=false
   }
 
-  //获取抄表册
-  async Mreadibook(){
-    this.cbc=[]
-    this.sliceArea=[]
-    let http = new HttpResetClass()
-    let getMeterReadingBooks = await http.load('POST','rs/logic/getMeterBooksData',
-      {data: {f_orgid: "('"+this.filialeid+"')"}},
-      {resolveMsg: null, rejectMsg: '获取失败！！！'})
-      this.cbc = [{label: '全部', value: '全部'}]
-      console.log('22222222222222222222222222222222222222')
-      console.log(JSON.stringify(getMeterReadingBooks))
-      console.log('22222222222222222222222222222222222222')
-      this.meterbooks=[]
-      this.meterbooks=getMeterReadingBooks.data.meterbooks
-      this.meterbooks.forEach((res) => {
-      this.cbc.push({label: res.f_book_name, value: res.id})
-      /*if(res.f_book_slice_area){
-        if(this.sliceArea.indexOf(res.f_book_slice_area)<0){
-          this.sliceArea.push(res.f_book_slice_area)
-        }
-      }*/
-    })
-
-  }
-  //获取子公司
-  async getOrgs(){
-    let http = new HttpResetClass()
-    let orgs = await http.load('POST', '/rs/search', {
-      source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $organization$)',
-      userid: global.login.id
-      //userid:"15130"
-    }, {resolveMsg: null, rejectMsg: '获取分公司出错！！！'})
-    console.log("分公司--"+JSON.stringify(orgs))
-    this.orgs = []
-    if(orgs.data.length>0){
-      orgs.data.forEach((res) => {
-        this.orgs.push({label: res.name, value: res.id})
-      })
-    }else{
-        this.orgs.push({label: this.filialeidname, value:this.filialeid})
-       // this.orgs.push({label: '测试公司', value:222})
-    }
-
-
-  }
-  //片区获取
-  async getSliceArea()  {
-    let http = new HttpResetClass()
-    let getAllArea = await http.load('POST', '/rs/search', {
-      source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-      userid: global.login.id
-    }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-      this.sliceArea = ['全部']
-      console.log('11111111111111111111111111111111111111')
-      console.log(getAllArea.data)
-      console.log('11111111111111111111111111111111111111')
-      getAllArea.data.forEach((res) => {
-        if(res.parentid==this.filialeid){
-          this.sliceArea.push(res.name)
-        }
-      })
-      console.log('片区' + this.sliceArea)
-  }
-
-
-
-  formatArrayFun(type,arr){
-    arr.forEach((result)=>{
-      this[type].push(result.value)
-    })
-  }
   flush(f){
     f()
   }