safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/examples/SafePlan-aode/comp.js

@@ -38,10 +38,13 @@ export default class Comp {
   orderList= ['按时间降序', '按时间升序']//排序下拉框的值
   currentorder='按时间降序'//排序下拉框当前选中的值
   // 新增安检计划时保存的数据
-  newPlan = {f_issued:"否"}
+  newPlan = {f_issued:"否",f_safecheck_type:"年度普检"}
   http = new HttpResetClass()
   //查询计划弹框中是否共享选项
   isAndNot = ["是", "否"]
+  //用户类型
+  userTypes = ["民用"]
+
   //安检计划查询中的是否是共享计划单选的当前选中值
   sIsAndNotSelect=''
   //用户列表的自选查询条件的值
@@ -62,26 +65,34 @@ export default class Comp {
   planItemConditionSelect="请选择条件"
   //当前输入的值
   planItemConditionValue=""
-
+  //excel导入组件显示控制
+  showModel=false
   //safecheckTypeList=Vue.$appdata.getParam("安检类型")
-  safecheckTypeList=["年度普检","送气类型"]
+  safecheckTypeList=["年度普检"]
 //安检员列表
   checker=[
 
   ]
+  //公司安检员列表
+  orgChecker=[]
+  residential_area=[]
   checkersname=[]
   //新建计划时保存是否共享计划的值，
   isShare="否"
   //安检类型
-  safecheckList=["年度普检","送气类型"]
+  safecheckList=["年度普检"]
+  //今年是否安检
+  yearChecked=["全部","已检","未检"]
+  yChecked=''
   //时间单位
   unitTime=["天","月"]
   selectTime="天"
   startday=""
   endday=""
   str=[]
+  uploadCondition=''
 //当前打开的安检计划id
-  SelectedPlan=""
+  SelectedPlan={}
   //燃气表增添项
   gasexpress=[{"lname":"燃气表照片","type":"picture"},
     {"lname":"表品牌","type":"string","readonly":true},
@@ -93,43 +104,130 @@ export default class Comp {
     {"lname":"左右表","type":"string","readonly":true}]
   //当前分公司id
   filialeid=global.login.orgid
-
-  //filialeid=453
-
+  filialeidname=global.login.orgs
+  orgs=[]
+  //filialeid=20284
+
+  usertypes=[]//用户类型
+  metertypes=[]//气表分类
+  pricetypes=[]//气价类型
+  pricenames=["22222","222221"]//气价名称---遍历获取
+  meterbrands= []//气表品牌---遍历获取
+  gasproperties=[]//用气性质
+  tablestate=[]//气表状态
   //用户列表查询条件json
   conditionJson=[
-    {column:"f_residential_area",checkname:"小区名称",type:"selector",options:[]},
     {column:"f_building",checkname:"楼栋号码",type:"input"},
+    {column:"useraddress",checkname:"地址",type:"input"},
     {column:"f_unit",checkname:"单元号码",type:"input"},
-    {column:"userType",checkname:"用户类型",type:"selector",options:['民用','非民用']},
-    {column:"f_user_state",checkname:"用户状态",type:"selector",options:['正常','停用']}
+    {column:"userType",checkname:"用户类型",type:"selector",options:['民用','非民用','煤改气']},
+    {column:"f_user_state",checkname:"用户状态",type:"selector",options:['正常','停用']},
+    {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}
     ]
+
   conditionList=[
     {selectitem:{column:"f_user_state",checkname:"用户状态",type:"selector",options:['正常','停用']},selectValue:'正常',num:0},
-    {selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:1},
-    {selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:2}
+    {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_meter_classify",checkname:"气表分类",type:"selector",options:this.metertypes},selectValue:'',num:4},
+    {selectitem:{column:"f_meter_brand",checkname:"气表品牌",type:"selector",options:this.meterbrands},selectValue:'',num:5},
+    {selectitem:{column:"f_table_state",checkname:"气表状态",type:"selector",options:this.tablestate},selectValue:'',num:6},
+    {selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:7}
   ]
   //安检项列表查询条件
   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_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+"-------------")
+    console.log("------------"+ind+"-------------"+value)
       this[modelname][ind]["num"]=ind
     this[modelname][ind][key]=value
     f()
   }
-//添加选择条件下拉框事件
+  //条件改变时修改下级选项框值
+  conditionChangeFun(type,f){
+    console.log("开始刷新条件"+type)
+    if(false){
+      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()
@@ -150,20 +248,50 @@ export default class Comp {
   async ready() {
     // 加载所有安检计划
     //this.readConfig()
-    await this.checkplan.searchList("/rs/sql/预约计划下发", {},{groupitem:"",f_filialeids:"("+this.filialeid+")",orderitem:"f_create_time desc"})
-   /* for (let i = 0; i <this.str.length ; i++) {
-      if (this.str[i].checkname=="燃气表"){
-        this.str[i].items=this.gasexpress.concat(this.str[i].items)
+    if(!this.filialeid){
+      Vue.showMessage("未检测到分公司信息，请重新登陆！")
+      return
+    }
+    await this.getOrgs()
+    this.checkplan.search.setField("safechecktype",'年度普检')
+    await this.checkplan.searchList("/api/af-safecheck/sql/预约计划下发", {"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()
-    this.getAreaList()
+    await this.getAreaList()
     //加载安检员名单
     console.log("-----------------")
     console.log(Vue.$appdata)
     console.log("当前加载到的信息："+JSON.stringify(global.login))
     this.searchChecker(global.login.id)
+  }
 
+  show1(){
+    this.showModel=true
   }
   //补录功能组装数据
   zzsj(){
@@ -192,24 +320,66 @@ export default class Comp {
     })
 
   }
+  //分公司发生改变
+  async orgChange(value,f){
+    console.log("----orgChange"+JSON.stringify(value))
+    if(value.value==this.filialeid){
+      f()
+      return
+    }
+    this.filialeid=value.value
+    this.filialeidname=value.label
+    this.user = new SearchList(true)
+    this.checkplanitems = new SearchList(true)
+    this.checkplan = new SearchList(true)
+    this.searchChecker(global.login.id)
+    this.getAreaList()
+    this.checkplan.search.setField("safechecktype",'年度普检')
+    await this.checkplan.searchList("/api/af-safecheck/sql/预约计划下发", {"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()
+  }
   //当前页面属性发生改变事件
   fieldChange(modelname,value,f){
     console.log(value)
     if(modelname=="user" || modelname=="checkplan" || modelname=="checkplanitems"){
-      this.setProperty(modelname,"checkername",value.name)
-      this.setProperty(modelname,"checkerid",value.id)
+      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"){
-      this.newPlan.f_checker_id=value.id
-      this.newPlan.f_checker=value.name
+      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"){
-      this.plan.f_checker= value.name
-      this.plan.f_checker_id=value.id
+      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
     }
@@ -268,6 +438,7 @@ export default class Comp {
 
   //按条件查询所有安检计划
   async loadCheckPlan(sortfield,f) {
+    this.isSend=true
     this.checkplan.check.checkes=[]
     if(sortfield){//如果传入空串说明是查询      传入非空串就是排序
       console.log("进入排序")
@@ -287,11 +458,11 @@ 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/预约计划下发",
       {"f_plan_name": "f_plan_name like '%{}%'",
             "f_plan_year":"f_plan_year={}",
             "f_plan_month":"f_plan_month={}",
-            "checkerid":"f_checker_id={}",
+            "checkerid":"f_checker_id='{}'",
             "isAndNot":"f_checker {}",
             "safechecktype":"f_safecheck_type='{}'"
             },
@@ -300,12 +471,16 @@ export default class Comp {
               groupitem:""
             }
     )
+    this.checkplan.check.checkAll=false
+    this.checkplan.check.checkes=[]
     f()
+    this.isSend=false
   }
 
   // 查询待检用户
   async searchUser(f) {
-    global.isSend=true
+    this.isSend=true
+    this.user.check.checkAll=false
     this.user.check.checkes=[]
     this.jointCondition1("conditionList","user")
     let sday=''
@@ -323,15 +498,24 @@ export default class Comp {
           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))
+          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,ua.f_last_check_date,GETDATE())>="+parseInt(sday,10))
+          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","")
     }
-    this.user.search.setField("f_filialeid",this.filialeid)
-    await this.user.searchList("/rs/sql/FetchUserFileByOrgNoRuHuSXQ", {
+    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_year_plan","<>")
+    await this.user.searchList("/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQ", {
       "f_filialeid": "ui.f_filialeid={}",
       "userinfocode": "ui.f_userinfo_code='{}'",
       "username": "ui.f_user_name like '%{}%'",
@@ -341,33 +525,72 @@ export default class Comp {
       "f_building":"ua.f_building='{}'",
       "f_unit":"ua.f_unit='{}'",
       "f_user_state":"ui.f_user_state='{}'",
-      "checkTime":" {}"
+      "checkTime":"{}",
+      "uploadCondition":"{}",
+      "f_devices":"de.f_devices_type='{}'",
+      "f_gasproperties":"uf.f_gasproperties='{}'",
+      "f_meter_classify":"uf.f_meter_classify='{}'",
+      "f_table_state":"uf.f_table_state='{}'",
+      "f_meter_brand":"gb.f_meter_brand='{}'",
+      "ychecked":" {}"
     }, {
-      "orderitem": 'f_userinfo_id',
+      "orderitem": 'f_residential_area,f_building,f_unit,f_floor,f_room',
       "f_usertype": '',
       "month": '',
       "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){
+/*  searchChecker(id){
     new HttpResetClass().load('POST', '/rs/search', {
-      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+      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', {
+      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.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/planItem", {"f_plan_id": "f_plan_id={}"}, {})
     f()
   }
   //得到更新数据
@@ -424,23 +647,28 @@ export default class Comp {
 
   // 打开安检计划，加载安检计划的所有安检单
   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/planItem", {"f_plan_id": "i.f_plan_id='{}'","f_state": "i.f_state !='{}'"}, {})
     f()
+    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/planItem",
         {"f_plan_id": "i.f_plan_id='{}'",
           "usercode": "i.f_userinfo_code='{}'",
           "username": "i.f_user_name='{}'",
@@ -449,18 +677,23 @@ 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_state": "i.f_state !='{}'"
+          "f_state": "i.f_state !='{}'",
+          "f_state1": "i.f_state ='{}'",
+          "f_area":"i.f_residential_area='{}'"
         },
         {})
       f()
+      this.isSend=false
     }else{
       Vue.showMessage("请选择安检计划")
     }
   }
 //加载更多数据
   async loadMore(modelname,f) {
+    this.isSend=true
       await this[modelname].list.loadMore()
     f()
+    this.isSend=false
   }
 
   //点击全选按钮事件      user-用户列表       planitem-计划项列表
@@ -474,7 +707,14 @@ export default class Comp {
     console.log("当前值"+modulename+"--------"+id)
       this[modulename].check.setCheckes(id)
   }
-
+  selectChanged(modulename, property, value,f){
+    if(value=='全部'){
+      this.setProperty(modulename, property, '')
+    }else{
+      this.setProperty(modulename, property, value)
+    }
+    f()
+  }
   //设置属性值
   setProperty(modulename, property, value) {
     console.log(modulename+"新添--"+property+"--"+value)
@@ -501,45 +741,82 @@ export default class Comp {
 
   //将客户信息拖至计划中
   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/AddCheckPlanItem"
+        }else if(this.user.search.model.userType=='非民用'){
+          url="/api/af-safecheck/logic/AddCheckPlanItemCivil"
+        }else{
+          Vue.showMessage("用户类型数据异常，请联系管理员！")
+          return
+        }
+      }else{
+        Vue.showMessage("请选择用户类型后！在进行计划下派操作")
+        return
+      }
       if(this.checkplanitems.search.model.f_plan_id){
-        let res=await this.http.load("POST", "/rs/logic/AddCheckPlanItem", {
+        this.isSend=true
+        let res=await this.http.load("POST", url, {
           data:{
             f_operator:global.login.name,
             f_plan_id:f_plan_id,
             f_safecheck_type:f_safecheck_type,
             f_filialeid:this.filialeid,
             f_subscribe_date:'',
-            condition:this.user.search.search({ "f_filialeid": "ui.f_filialeid={}",
+            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 like '%{}%'",
+              "f_residential_area":"ua.f_residential_area = '{}'",
               "f_building":"ua.f_building='{}'",
               "f_unit":"ua.f_unit='{}'",
-              "checkTime":" {}"}),
+              "f_user_state":"ui.f_user_state='{}'",
+              "checkTime":"{}",
+              "uploadCondition":"{}",
+              "f_devices":"de.f_devices_type='{}'",
+              "f_gasproperties":"uf.f_gasproperties='{}'",
+              "f_meter_classify":"uf.f_meter_classify='{}'",
+              "f_table_state":"uf.f_table_state='{}'",
+              "f_meter_brand":"gb.f_meter_brand='{}'",
+              "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(()=>{})
         await this.searchPlanItem(()=>{})
         await this.loadCheckPlan("",()=>{})
         f()
+        this.isSend=false
       }else{
         Vue.showMessage("请先打开一个计划再进行操作")
       }
@@ -548,8 +825,10 @@ export default class Comp {
 
   //将某个计划下的一项拖到另一个计划
   async dragtoOtherPlanIteem(checkplanid,dragParam,f) {
-    if(dragParam=='item'){
-      let res=await this.http.load("POST", "/rs/logic/UpCheckPlanItem", {
+
+    /*if(dragParam=='item'){
+      this.isSend=true
+      let res=await this.http.load("POST", "/api/af-safecheck/logic/UpCheckPlanItem", {
         data:{
           f_operator:global.login.name,
           f_plan_id:checkplanid,
@@ -560,7 +839,11 @@ export default class Comp {
             "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_last_check_result":"i.f_last_check_result like '%{}%'",
+            "f_state1": "i.f_state ='{}'",
+            "f_state": "i.f_state !='{}'",
+            "f_area":"i.f_residential_area='{}'"
+          }),
           switchCheckAll:this.checkplanitems.check.switchCheckAll,
           checkAll:this.checkplanitems.check.checkAll,
           param:this.checkplanitems.check.checkes,
@@ -577,15 +860,31 @@ export default class Comp {
         Vue.showMessage("更换安检计划失败！")
       }
       f()
-    }
+      this.isSend=false
+    }*/
 
   }
-
+  //清空用户编号
+  clearUserInfoId(){
+    this.setProperty("user","uploadCondition",'')
+    Vue.showMessage("已清空用户编号")
+  }
   //修改计划项状态为作废
   async delPlanItem(dragParam,f) {
     console.log("进入作废计划项方法")
+
     if(dragParam=='item'){
-      let resu=await this.http.load("POST", "/rs/logic/UpCheckPlanItemState", {
+      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/UpCheckPlanItemState", {
         data: {
           f_operator:global.login.name,
           condition:this.checkplanitems.search.search({"f_plan_id": "i.f_plan_id='{}'",
@@ -595,7 +894,11 @@ export default class Comp {
             "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_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,
@@ -612,6 +915,7 @@ export default class Comp {
       }else{
         Vue.showMessage("取消安检计划失败!")
       }
+      this.isSend=false
     }
 
   }
@@ -621,31 +925,42 @@ export default class Comp {
     if(!this.validationCreatePlan()){
       return
     }
-    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("计划名称不能重复！")
-      return
-    }
+    this.isSend=true
+    /*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 : '新建计划失败！'},2500)
+    await Vue.resetpost("/api/af-safecheck/logic/createCheckPlan", {"data": this.newPlan},{resolveMsg : '新建计划成功！', rejectMsg : '新建计划失败！'},2500)
     await this.loadCheckPlan('',()=>{})
-    this.newPlan={f_issued:"否"}
+    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={}
   }
@@ -821,7 +1136,8 @@ export default class Comp {
       Vue.showMessage("请选择要下发的安检计划")
       return
     }
-    let res=await this.http.load("POST", "/rs/logic/NewBespeakCheckPlan", {
+    this.isSend=true
+    let res=await this.http.load("POST", "/api/af-safecheck/logic/NewBespeakCheckPlan", {
       data:{
         f_issued:'是',
         f_issue_time:this.getNowFormatDate(),
@@ -837,6 +1153,7 @@ export default class Comp {
     }else{
       Vue.showMessage("下发失败！")
     }
+    this.isSend=false
   }
 
   //删除安检计划
@@ -845,7 +1162,8 @@ export default class Comp {
       Vue.showMessage("请选择要删除的安检计划")
       return
     }
-    let res=await this.http.load("POST", "/rs/logic/deleteCheckPlan", {
+    this.isSend=true
+    let res=await this.http.load("POST", "/api/af-safecheck/logic/deleteCheckPlan", {
       data:{
         f_operator:global.login.name,//global.login.name,
         condition:this.checkplan.search.search({}),
@@ -857,14 +1175,15 @@ export default class Comp {
     }, {resolveMsg: "删除成功！", rejectMsg: "删除失败！"})
       console.log(JSON.stringify(res))
     if(res.data.code==200){
-      Vue.showAlert("删除成功！"+res.data.message,"success",2500)
+      Vue.showAlert("删除成功！","success",2500)
       await  this.loadCheckPlan('',()=>{})
     }else{
-      Vue.showAlert("删除失败！"+res.data.message,"success",2500)
+      Vue.showAlert("删除失败！","success",2500)
     }
       this.checkplanitems.search.model.f_plan_id=""
       this.checkplanitems.list.data=[]
       f()
+    this.isSend=false
   }
   //修改计划时 用来存储当前选中要修改的计划
   plan={}
@@ -883,7 +1202,12 @@ export default class Comp {
   }
   //修改安检计划
   async upCheckPlan(f){
-    let res=await this.http.load("POST", "/rs/logic/updateCheckPlan", {
+    if(this.plan.f_issued=='已下发'){
+      Vue.showMessage("该计划已下发，无法进行修改！")
+      return
+    }
+    this.isSend=true
+    let res=await this.http.load("POST", "/api/af-safecheck/logic/updateCheckPlan", {
       data:{
         f_checker:this.plan.f_checker,
         f_checker_id:this.plan.f_checker_id,
@@ -900,6 +1224,8 @@ export default class Comp {
       Vue.showAlert("修改失败！"+res.data.message,"success",2500)
     }
     f()
+    window.dispatchEvent(new CustomEvent("goRefresh"),{})
+    this.isSend=false
   }
 
 /*  getDataLength(modelname){
@@ -910,9 +1236,11 @@ export default class Comp {
   }*/
   //新建安检计划非空判断
   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("请选择安检年份！")
@@ -934,6 +1262,7 @@ export default class Comp {
       Vue.showMessage("请选择安检类型！")
       return false
     }
+
     return true
   }
 
@@ -958,7 +1287,7 @@ export default class Comp {
       //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()
@@ -1060,23 +1389,24 @@ export default class Comp {
     }
 //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)=>{
+    }, {resolveMsg: null, rejectMsg: null})
       if (res.data) {
-        let arr=[]
+        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.conditionJson[0].options=arr
+        this.residential_area=arr
       }
-    })
 
   }
 
@@ -1125,6 +1455,85 @@ async getGasMan(){
     }
 
 }
+  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.user.list.data.length==0){
+      Vue.showMessage("未检测到要导出的用户，请检查条件！")
+      return
+    }
+    this.isSend=true
+    //this.jointCondition1("planitemconditionList","checkplanitems")
+    let res=await this.http.load('POST','api/af-safecheck/logic/exportfile',
+      {
+        "data": {
+          "body": {
+            "data": {
+              "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":"uf.f_gasproperties='{}'",
+                "f_meter_classify":"uf.f_meter_classify='{}'",
+                "f_table_state":"uf.f_table_state='{}'",
+                "f_meter_brand":"gb.f_meter_brand='{}'",
+                "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_user_phone:用户电话","f_residential_area:小区名称","f_last_check_date:最后一次安检时间","f_last_check_state:最后一次安检状态","f_address:详细地址"],
+            "templateName": '用户安检情况',
+            "sqlName": "FetchUserFileByOrgNoRuHuSXQ"
+          },
+        }
+      }
+      ,{resolveMsg: null, rejectMsg: null})
+    console.log("excel结果---"+JSON.stringify(res))
+    let link = document.createElement('a');
+    let path = res.data[0].filename
+    //webapps这个是在服务器上导出用的
+    let pathName = "http://" + location.host + "/webapps" + path.split('webapps')[1]
+    //excel这个是在本地导出用的
+    link.href = pathName;
+    link.download = path.split('excel/')[1];
+    link.dispatchEvent(new MouseEvent('click'));
+    this.isSend=false
+  }
 
   flush(f){
     f()