safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/examples/SafePlan/comp.js

@@ -3,10 +3,26 @@ 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,7 +39,7 @@ export default class Comp {
   orderList= ['按时间降序', '按时间升序']//排序下拉框的值
   currentorder='按时间降序'//排序下拉框当前选中的值
   // 新增安检计划时保存的数据
-  newPlan = {f_issued:"否",f_safecheck_type:""}
+  newPlan = {f_issued:"否"}
   http = new HttpResetClass()
   //查询计划弹框中是否共享选项
   isAndNot = ["是", "否"]
@@ -53,38 +69,46 @@ export default class Comp {
   planItemConditionSelect="请选择条件"
   //当前输入的值
   planItemConditionValue=""
-  sudeState=['全部','是','否']
-  issude=''
+
   //safecheckTypeList=Vue.$appdata.getParam("安检类型")
-  safecheckTypeList=[]
-  //片区列表
-  sliceArea=[]
-  //抄表册
-  cbc=[]
-  //保存当前公司所有抄表册
-  meterbooks=[]
-  //分公司列表
-  orgs=[]
+  safecheckTypeList=["年度普检","送气类型"]
 //安检员列表
-  checker=[]
+  checker=[
+    {templatename: "useredit",
+      logindate: "2020-04-15 00:58:35.65",
+      state: "在职",
+      id: "8817",
+      name:"张桥"},
+    {templatename: "useredit",
+      logindate: "2020-04-15 00:58:35.65",
+      state: "在职",
+      id: "113857",
+    name:"李四"},
+    {templatename: "useredit",
+      logindate: "2020-04-15 00:58:35.65",
+      state: "在职",
+      id: "113857",
+      name:"王五"},
+    {templatename: "useredit",
+      logindate: "2020-04-15 00:58:35.65",
+      state: "在职",
+      id: "113857",
+      name:"赵六"}
+  ]
   checkersname=[]
   //新建计划时保存是否共享计划的值，
   isShare="否"
   //安检类型
-  safecheckList=[]
+  safecheckList=["年度普检","送气类型"]
   //时间单位
   unitTime=["天","月"]
   selectTime="天"
   startday=""
   endday=""
   str=[]
-  //用气性质
-  gasproperties=[]
 //当前打开的安检计划id
   SelectedPlan=""
   //燃气表增添项
-  //excel导入组件显示控制
-  showModel=false
   gasexpress=[{"lname":"燃气表照片","type":"picture"},
     {"lname":"表品牌","type":"string","readonly":true},
     {"lname":"表号","type":"string","readonly":true},
@@ -95,34 +119,21 @@ export default class Comp {
     {"lname":"左右表","type":"string","readonly":true}]
   //当前分公司id
   filialeid=global.login.orgid
-  filialeidname=global.login.orgs
 
-  //filialeid=287
-  //filialeidname="梁平区聚源天然气有限公司"
-  yearCheckList=['全部','已在计划中','未在计划中']
-  yChecked=""
+  //filialeid=453
+
   //用户列表查询条件json
   conditionJson=[
     {column:"f_residential_area",checkname:"小区名称",type:"input"},
     {column:"f_building",checkname:"楼栋号码",type:"input"},
     {column:"f_unit",checkname:"单元号码",type:"input"},
     {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_gasproperties",checkname:"用气性质",type:"selector",options:this.gasproperties},
+    {column:"f_user_state",checkname:"用户状态",type:"selector",options:['正常','停用']}
     ]
   conditionList=[
     {selectitem:{column:"f_user_state",checkname:"用户状态",type:"selector",options:['正常','停用']},selectValue:'正常',num:0},
-    {selectitem:{column:"f_metertitles",checkname:"表箱号",type:"input"},selectValue:'',num:1},
-    {selectitem:{column:"f_gasproperties",checkname:"用气性质",type:"selector",options:this.gasproperties},selectValue:'',num:2},
-    {selectitem:{column:"user_start",checkname:"开户起始",type:"date"},selectValue:'',num:3},
-    {selectitem:{column:"user_end",checkname:"开户结束",type:"date"},selectValue:'',num:4},
-    {selectitem:{column:"check_start",checkname:"安检起始",type:"date"},selectValue:'',num:5},
-    {selectitem:{column:"check_end",checkname:"安检结束",type:"date"},selectValue:'',num:6}
+    {selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:1},
+    {selectitem:{checkname:"请选择",type:"input"},selectValue:'',num:2}
   ]
   //安检项列表查询条件
   planitemconditionJson=[
@@ -164,21 +175,22 @@ 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.readConfig()
+    await this.checkplan.searchList("/api/af-safecheck/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)
+      }
+    }
+    this.getGasMan()
    // this.getAreaList()
     //加载安检员名单
     console.log("-----------------")
     console.log(Vue.$appdata)
     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()
+
   }
   //补录功能组装数据
   zzsj(){
@@ -204,7 +216,7 @@ export default class Comp {
   }
   //当前页面属性发生改变事件
   fieldChange(modelname,value,f){
-    console.log("-------fieldChange"+value)
+    console.log(value)
     if(modelname=="user" || modelname=="checkplan" || modelname=="checkplanitems"){
       this.setProperty(modelname,"checkername",value.name)
       this.setProperty(modelname,"checkerid",value.id)
@@ -223,42 +235,10 @@ export default class Comp {
       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){
-      f()
-      return
-    }
-    this.filialeid=value.value
-    this.filialeidname=value.label
-    this.user = new SearchList(true)
-    this.checkplanitems = 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"})
-    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)
-    }
+    this[modelname]=value
     f()
   }
+
   jointCondition1(field,modelname){
     for (let i =0 ;i<this[field].length;i++){
       if(!this[field][i].selectValue){
@@ -310,12 +290,10 @@ export default class Comp {
 
   //按条件查询所有安检计划
   async loadCheckPlan(sortfield,f) {
-    this.isSend=true
     this.checkplan.check.checkes=[]
     if(sortfield){//如果传入空串说明是查询      传入非空串就是排序
       console.log("进入排序")
       if(sortfield==this.currentorder){
-        this.isSend=false
         return
       }else{
         this.currentorder=sortfield
@@ -331,29 +309,25 @@ 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={}",
             "isAndNot":"f_checker {}",
-            "safechecktype":"f_safecheck_type='{}'",
-            "issude":"f_issued = '{}'"
+            "safechecktype":"f_safecheck_type='{}'"
             },
       {orderitem:fieldValue,
               f_filialeids:"("+this.filialeid+")",
               groupitem:""
             }
     )
-    //调刷新函数？？？？
-    console.log('调刷新函数？？？？--')
     f()
-    this.isSend=false
   }
 
   // 查询待检用户
   async searchUser(f) {
-    this.isSend=true
+    global.isSend=true
     this.user.check.checkes=[]
     this.jointCondition1("conditionList","user")
     let sday=''
@@ -378,15 +352,8 @@ export default class Comp {
     }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")
-    }else{
-      this.setProperty("user","ychecked","")
-    }
     this.user.search.setField("f_filialeid",this.filialeid)
-    await this.user.searchList("/rs/sql/FetchUserFileByOrgNoRuHuSXQ", {
+    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 '%{}%'",
@@ -396,19 +363,9 @@ export default class Comp {
       "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='{}'",
-      "uploadCondition":" {}"
+      "checkTime":" {}"
     }, {
-      "orderitem": 'f_residential_area,f_building,f_unit,f_floor,f_room',
+      "orderitem": 'ua.f_building,ua.f_floor,ua.f_room',
       "f_usertype": '',
       "month": '',
       "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
@@ -417,26 +374,21 @@ export default class Comp {
       "endday":""
     })
     f()
-    this.isSend=false
   }
 
-  //查询安检员selectChanged
+  //查询安检员
   async searchChecker(id){
    let res=await this.http.load('POST', '/rs/search', {
-      source: 'tool.getChildrenOfResName($安检员$)',
+      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
       userid: id
     }, {resolveMsg: null, rejectMsg: null})
-    this.checker=[]
-    res.data.forEach((resRow) => {
-      if(resRow.orgid==this.filialeid){
-        this.checker.push(resRow)
-      }
-    })
+    this.checker=res.data
+
     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()
   }
   //得到更新数据
@@ -537,26 +489,24 @@ export default class Comp {
   }
   // 打开安检计划，加载安检计划的所有安检单
   async openPlan(plan, f) {
-    this.isSend=true
     this.checkplanitems.check.checkes=[]
     this.SelectedPlan=plan.id
     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 !='{}'"}, {})
-    f()
+    await this.checkplanitems.searchList("/api/af-safecheck/sql/planItem", {"f_plan_id": "i.f_plan_id='{}'","f_state": "i.f_state !='{}'"}, {})
+    //f()
     //this.checkplanitems.search.model.f_plan_id
-    this.isSend=false
+    window.dispatchEvent(new CustomEvent("goRefresh"),{})
   }
 
   //根据条件查询某个安检计划下的安检单
   async searchPlanItem(f) {
     this.checkplanitems.check.checkes=[]
     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='{}'",
@@ -570,17 +520,14 @@ export default class Comp {
         },
         {})
       f()
-      this.isSend=false
     }else{
       Vue.showMessage("请选择安检计划")
     }
   }
 //加载更多数据
   async loadMore(modelname,f) {
-    this.isSend=true
       await this[modelname].list.loadMore()
-      f()
-    this.isSend=false
+    f()
   }
 
   //点击全选按钮事件      user-用户列表       planitem-计划项列表
@@ -596,44 +543,9 @@ export default class Comp {
   }
 
   //设置属性值
-  setProperty(modulename, property, value,f) {
-
+  setProperty(modulename, property, value) {
     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, '')
-    }else{
-      this[modulename].search.setField(property, value)
-    }
+    this[modulename].search.setField(property, value)
   }
 
   //列表中的选择框是否被选中
@@ -661,16 +573,14 @@ export default class Comp {
     if(dragParam=='user'){
       this.jointCondition("user")
       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", "/api/af-safecheck/logic/AddCheckPlanItem", {
           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 '%{}%'",
@@ -678,19 +588,7 @@ export default class Comp {
               "f_residential_area":"ua.f_residential_area like '%{}%'",
               "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='{}'",
-              "uploadCondition":" {}"
-            }),
+              "checkTime":" {}"}),
             switchCheckAll:this.user.check.switchCheckAll,
             checkAll:this.user.check.checkAll,
             param:this.user.check.checkes,
@@ -709,7 +607,6 @@ export default class Comp {
         await this.searchPlanItem(()=>{})
         await this.loadCheckPlan("",()=>{})
         f()
-        this.isSend=false
       }else{
         Vue.showMessage("请先打开一个计划再进行操作")
       }
@@ -719,8 +616,7 @@ export default class Comp {
   //将某个计划下的一项拖到另一个计划
   async dragtoOtherPlanIteem(checkplanid,dragParam,f) {
     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,
@@ -731,10 +627,7 @@ 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_state": "i.f_state !='{}'",
-            "f_state1": "i.f_state ='{}'"
-          }),
+            "f_last_check_result":"i.f_last_check_result like '%{}%'"}),
           switchCheckAll:this.checkplanitems.check.switchCheckAll,
           checkAll:this.checkplanitems.check.checkAll,
           param:this.checkplanitems.check.checkes,
@@ -751,7 +644,6 @@ export default class Comp {
         Vue.showMessage("更换安检计划失败！")
       }
       f()
-      this.isSend=false
     }
 
   }
@@ -760,46 +652,36 @@ export default class Comp {
   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
-          })
-
+      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='{}'",
+            "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})
+      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("取消安检计划失败!")
+      }
     }
 
   }
@@ -809,12 +691,10 @@ export default class Comp {
     if(!this.validationCreatePlan()){
       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'}})
+    let res=await this.http.load("POST","/api/af-safecheck/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.isShare=="是"){
@@ -826,15 +706,11 @@ export default class Comp {
     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('',()=>{})
+    await Vue.resetpost("/api/af-safecheck/logic/createCheckPlan", {"data": this.newPlan},{resolveMsg : '新建计划成功！', rejectMsg : '新建计划失败！'},2500)
+    await this.loadCheckPlan('',()=>{})
     this.newPlan={f_issued:"否"}
     this.isShare="否"
-    await this.loadCheckPlan('',()=>{})
     f()
-    window.dispatchEvent(new CustomEvent("goRefresh"),{})
-    this.isSend=false
-
   }
 
   // 取消新建安检计划
@@ -985,8 +861,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       Vue.showMessage("请选择要下发的安检计划")
       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/NewBespeakCheckPlan", {
       data:{
         f_issued:'是',
         f_issue_time:this.getNowFormatDate(),
@@ -1002,7 +877,6 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
     }else{
       Vue.showMessage("下发失败！")
     }
-    this.isSend=false
   }
 
   //删除安检计划
@@ -1011,8 +885,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       Vue.showMessage("请选择要删除的安检计划")
       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/deleteCheckPlan", {
       data:{
         f_operator:global.login.name,//global.login.name,
         condition:this.checkplan.search.search({}),
@@ -1032,7 +905,6 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       this.checkplanitems.search.model.f_plan_id=""
       this.checkplanitems.list.data=[]
       f()
-    this.isSend=false
   }
   //修改计划时 用来存储当前选中要修改的计划
   plan={}
@@ -1051,12 +923,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
   }
   //修改安检计划
   async upCheckPlan(f){
-    if(this.plan.f_issued=='已下发'){
-      Vue.showMessage("该计划已下发，无法进行修改！")
-      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/updateCheckPlan", {
       data:{
         f_checker:this.plan.f_checker,
         f_checker_id:this.plan.f_checker_id,
@@ -1073,7 +940,6 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       Vue.showMessage("修改失败！"+res.data.message,"success",2500)
     }
     f()
-    this.isSend=false
   }
 
 /*  getDataLength(modelname){
@@ -1132,7 +998,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       //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()
@@ -1255,7 +1121,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
 //console.log(this.fdevices)
   }
   getAreaList() {
-    let res = this.http.load('POST', '/rs/sql/safe_singleTable_GroupBy', {
+    let res = this.http.load('POST', '/api/af-safecheck/sql/safe_singleTable_GroupBy', {
       data: {
         items: 'f_residential_area',
         tablename: 't_area',
@@ -1309,9 +1175,8 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       Vue.showMessage("请选择先打开一个安检计划！")
       return
     }
-    this.isSend=true
     this.jointCondition1("planitemconditionList","checkplanitems")
-    let res=await this.http.load('POST','rs/logic/SafeExportExcel',
+    let res=await this.http.load('POST','api/af-safecheck/logic/exportfile',
       {
         "data": {
           "body": {
@@ -1328,7 +1193,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
                 "f_state1": "i.f_state ='{}'"
               })
             },
-            "field": ["f_userinfo_code:用户编号","f_user_name:用户名称", "f_user_type:用户类型", "f_residential_area:小区名称", "f_state:安检状态","f_address:详细地址","f_user_phone:用户电话"],
+            "field": ["f_userinfo_code:用户编号","f_user_name:用户名称", "f_user_type:用户类型", "f_residential_area:小区名称", "f_state:安检状态","f_address:详细地址"],
             "templateName": this.plan.f_plan_name,
             "sqlName": "planItem"
           },
@@ -1344,86 +1209,22 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
     link.href = pathName;
     link.download = path.split('excel/')[1];
     link.dispatchEvent(new MouseEvent('click'));
-    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 getGasMan(){
 
-  }
-  //片区获取
-  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)
-  }
+  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})
 
-  show1(){
-    this.showModel=true
-  }
-  //清空用户编号
-  clearUserInfoId(){
-    this.setProperty("user","uploadCondition",'')
-    Vue.showMessage("已清空用户编号")
-  }
-  formatArrayFun(type,arr){
-    arr.forEach((result)=>{
-      this[type].push(result.value)
-    })
-  }
+    this.checkerMess=getGasman.data
+    for (var i = 0; i <getGasman.data.length ; i++) {
+      this.checkersname.push(getGasman.data[i].name)
+    }
+}
   flush(f){
     f()
   }