safecheck-client 3.0.34-gongyi → 3.0.35-2

package/examples/SafePlan-liaoyuan/TestData.js

@@ -412,11 +412,11 @@ export default class TestData {
   }
 
   addNewPlan(){
-    console.log("添加新计划")
+    //tag
   }
 
   cancel(){
-    console.log("取消")
+    //tag
   }
 
   //设置属性值
@@ -438,7 +438,7 @@ export default class TestData {
 
   //删除计划项
   delPlanItem = function () {
-    console.log("开始执行删除")
+    //tag
   }
   //新建计划
   addCheckPlan = function () {

package/examples/SafePlan-liaoyuan/comp.js

@@ -83,6 +83,8 @@ export default class Comp {
   gasproperties=['全部']
 //当前打开的安检计划id
   SelectedPlan=""
+  //excel导入组件显示控制
+  showModel=false
   //燃气表增添项
   gasexpress=[{"lname":"燃气表照片","type":"picture"},
     {"lname":"表品牌","type":"string","readonly":true},
@@ -113,6 +115,7 @@ export default class Comp {
     {column:"check_end",checkname:"安检结束",type:"date"},
     {column:"f_metertitles",checkname:"表箱号",type:"input"},
     {column:"f_gasproperties",checkname:"用气性质",type:"selector",options:this.gasproperties},
+    {column:"f_last_check_state",checkname:"安检状态",type:"selector",options:['入户','拒检','到访不遇']}
     ]
   conditionList=[
     {selectitem:{column:"user_start",checkname:"开户起始",type:"date"},selectValue:'',num:0},
@@ -135,7 +138,7 @@ export default class Comp {
   ]
   //下拉框条件改变json数组
   conditionListChange(modelname,ind,key,value,f){
-    console.log("------------"+ind+"-------------")
+    //tag
       this[modelname][ind]["num"]=ind
     this[modelname][ind][key]=value
     f()
@@ -165,10 +168,10 @@ export default class Comp {
     await this.checkplan.searchList("/rs/sql/预约计划下发", {},{groupitem:"",f_filialeids:"("+this.filialeid+")",orderitem:"f_create_time desc"})
    // this.getAreaList()
     //加载安检员名单
-    console.log("-----------------")
-    console.log(Vue.$appdata)
+    //tag
+    //tag
     this.setProperty("user","f_user_state",'正常')
-    console.log("当前加载到的信息："+JSON.stringify(global.login))
+    //tag)
     this.formatArrayFun('gasproperties',Vue.$appdata.getParam('用气性质'))
     this.formatArrayFun('safecheckTypeList',Vue.$appdata.getParam('安检类型'))
     this.formatArrayFun('safecheckList',Vue.$appdata.getParam('安检类型'))
@@ -180,12 +183,12 @@ export default class Comp {
   //补录功能组装数据
   zzsj(){
     let deviceconfig=ObjConfig.getObjConfig(this.needconfig.safecheck.DevicesConfig)
-    console.log("=============ZZSJ1>"+JSON.stringify(deviceconfig))
+    //tag)
     for (let i = 0; i < deviceconfig.length; i++) {
-      console.log("==============>"+JSON.stringify(deviceconfig[i]))
-      console.log("==============>"+JSON.stringify(deviceconfig[i].index))
+      //tag)
+      //tag)
       this.str[deviceconfig[i].index-1]=deviceconfig[i]
-      console.log("===========ZZSJ2>"+JSON.stringify(this.str[deviceconfig[i].index]))
+      //tag)
     }
 
   }
@@ -193,7 +196,7 @@ export default class Comp {
     let http = new HttpResetClass()
     http.load('GET', `/phone/rs/vue`, {}, {resolveMsg: null, rejectMsg: null}).then(res => {
       this.needconfig = res.data
-      console.log("请求得到的数据"+JSON.stringify(this.needconfig))
+      //tag)
       let aa=this.needconfig.safecheck.DevicesConfig
       this.zzsj()
     })
@@ -201,7 +204,7 @@ export default class Comp {
   }
   //当前页面属性发生改变事件
   fieldChange(modelname,value,f){
-    console.log("-------fieldChange"+value)
+    //tag
     if(modelname=="user" || modelname=="checkplan" || modelname=="checkplanitems"){
       this.setProperty(modelname,"checkername",value.name)
       this.setProperty(modelname,"checkerid",value.id)
@@ -228,7 +231,7 @@ export default class Comp {
     f()
   }
   async orgChange(value,f){
-    console.log("----orgChange"+JSON.stringify(value))
+    //tag)
     if(value.value==this.filialeid){
       f()
       return
@@ -245,12 +248,12 @@ export default class Comp {
   }
   //json下拉改变时间
   selectChanged(modelname,key,valuename,value,f){
-    console.log('value[valuename]'+modelname+key+valuename+'----'+JSON.stringify(value))
+    //tag)
     if(value.label=='全部' || !value){
       this[modelname].search.setField(key, '')
       this[modelname].search.setField(key+'name', '全部')
     }else{
-      console.log("value[valuename]"+value[valuename])
+      //tag
       this[modelname].search.setField(key, value.value)
       this[modelname].search.setField(key+'name', value.label)
     }
@@ -261,7 +264,7 @@ export default class Comp {
       if(!this[field][i].selectValue){
         continue
       }
-      console.log("this[field][i].column:"+this[field][i].column+"---"+"this[field][i].selectValue"+this[field][i].selectValue)
+      //tag
       this.setProperty(modelname,this[field][i].selectitem.column,this[field][i].selectValue)
     }
   }
@@ -310,7 +313,7 @@ export default class Comp {
     this.isSend=true
     this.checkplan.check.checkes=[]
     if(sortfield){//如果传入空串说明是查询      传入非空串就是排序
-      console.log("进入排序")
+      //tag
       if(sortfield==this.currentorder){
         this.isSend=false
         return
@@ -327,7 +330,7 @@ export default class Comp {
         fieldValue='f_create_time'
         break
     }
-    console.log("值"+sortfield+"--当前值"+this.currentorder+"---排序值："+fieldValue)
+    //tag
     await this.checkplan.searchList("/rs/sql/预约计划下发",
       {"f_plan_name": "f_plan_name like '%{}%'",
             "f_plan_year":"f_plan_year={}",
@@ -343,7 +346,7 @@ export default class Comp {
             }
     )
     //调刷新函数？？？？
-    console.log('调刷新函数？？？？--')
+    //tag
     f()
     this.isSend=false
   }
@@ -400,9 +403,11 @@ export default class Comp {
       "check_start":" ua.f_last_check_date >='{}'",
       "check_end":" ua.f_last_check_date<= '{}'",
       "area":" f_book_slice_area ='{}'",
+      "uploadCondition":" {}",
       "ychecked":" {}",
       "f_metertitles":" uf.f_metertitles='{}'",
-      "f_gasproperties":" uf.f_gasproperties='{}'"
+      "f_gasproperties":" uf.f_gasproperties='{}'",
+      "f_last_check_state":" ui.f_last_check_state='{}'"
     }, {
       "orderitem": 'f_residential_area,f_building,f_unit,f_floor,f_room',
       "f_usertype": '',
@@ -428,7 +433,7 @@ export default class Comp {
         this.checker.push(resRow)
       }
     })
-    console.log("安检员列表---"+JSON.stringify(res)+"---id"+this.filialeid)
+    //tag+"---id"+this.filialeid)
   }
 
   async searchPlanItems(f) {
@@ -484,7 +489,7 @@ export default class Comp {
     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))
+    //tag)
     this.changeListButton()
   }
   //改变数组的样式
@@ -492,7 +497,7 @@ export default class Comp {
     let listarray=[]
     for (let i = 0; i < this.listbutton.length; i++) {
       if (!this.listbutton[i].mname){
-        console.log("这是"+this.listbutton[i].lname.length)
+        //tag
         listarray.push(this.listbutton[i])
         listarray.push({"lname":"","type":"","mname":"","selected":"","level":"","isdefect":""})
         listarray.push({"lname":"","type":"","mname":"","selected":"","level":"","isdefect":""})
@@ -512,13 +517,13 @@ export default class Comp {
         }
       }
     }
-    console.log("需要的数据"+JSON.stringify(listarray))
+    //tag)
     this.listbutton=listarray
     this.tranlistbutton()
   }
 //横向分开list
   tranlistbutton(){
-    console.log("jinru111111111111")
+    //tag
     for (let i = 0; i < this.listbutton.length; i++) {
       if((i+1)%4==1){
         this.listbuttona.push(this.listbutton[i])
@@ -550,7 +555,7 @@ export default class Comp {
     this.checkplanitems.check.checkes=[]
     if(this.checkplanitems.search.model.f_plan_id){
       this.isSend=true
-      console.log("进入加载安检计划项"+this.checkplanitems.search.model.f_plan_id)
+      //tag
       this.jointCondition1("planitemconditionList","checkplanitems")
       await this.checkplanitems.searchList("/rs/sql/planItem",
         {"f_plan_id": "i.f_plan_id='{}'",
@@ -587,14 +592,14 @@ export default class Comp {
 
   //当选中列表中某项时触发
   addParam(modulename, id) {
-    console.log("当前值"+modulename+"--------"+id)
+    //tag
       this[modulename].check.setCheckes(id)
   }
 
   //设置属性值
   setProperty(modulename, property, value,f) {
 
-    console.log(modulename+"新添--"+property+"--"+value)
+    //tag
    if(property=='area'){
      this.selectChanged("user","meterbook","","",f)
       if(value=='全部'){
@@ -638,14 +643,14 @@ export default class Comp {
 }
   // 给新建安检计划设置属性值
   setNewPlan(property, value) {
-    console.log(value)
+    //tag
     this.newPlan[property] = value
     return this
   }
   //将某项拖动到计划中
   //dragParam：从拖动的起始位置传入的参数
   async dragtoPlan(f_plan_id,f_safecheck_type,f_filialeid,dragParam,f){
-    console.log("当前传入："+dragParam)
+    //tag
       await this.dragtoPlanItem(f_plan_id,f_safecheck_type,dragParam,f)
       await this.dragtoOtherPlanIteem(f_plan_id,dragParam,f)
   }
@@ -653,7 +658,7 @@ export default class Comp {
   //将客户信息拖至计划中
   async dragtoPlanItem(f_plan_id,f_safecheck_type,dragParam,f) {
 
-    console.log("计划id："+f_plan_id+"公司id："+this.filialeid)
+    //tag
     if(dragParam=='user'){
       this.jointCondition("user")
       if(this.checkplanitems.search.model.f_plan_id){
@@ -681,10 +686,12 @@ export default class Comp {
               "user_end":" ui.f_createfile_date <='{}'",
               "check_start":" ua.f_last_check_date >='{}'",
               "check_end":" ua.f_last_check_date<= '{}'",
+              "uploadCondition":" {}",
               "area":" ua.f_slice_area='{}'",
               "ychecked":" {}",
               "f_metertitles":" uf.f_metertitles='{}'",
-              "f_gasproperties":" uf.f_gasproperties='{}'"
+              "f_gasproperties":" uf.f_gasproperties='{}'",
+              "f_last_check_state":" ui.f_last_check_state='{}'"
             }),
             switchCheckAll:this.user.check.switchCheckAll,
             checkAll:this.user.check.checkAll,
@@ -692,7 +699,7 @@ export default class Comp {
             columnName: "ua.id"
           }
         }, {resolveMsg: null, rejectMsg: null})
-        console.log("重复数量-"+JSON.stringify(res.data.result)+"---"+res.data.result.length)
+        //tag+"---"+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+"条用户地址已经存在于其他计划中":""))
@@ -753,7 +760,7 @@ export default class Comp {
 
   //修改计划项状态为作废
   async delPlanItem(dragParam,f) {
-    console.log("进入作废计划项方法")
+    //tag
     if(dragParam=='item'){
       Vue.showMessage("此操作无法撤回,确定要执行作废安检单操作吗？",['confirm','cancel']).then((button)=>{
         if(button=='confirm'){
@@ -779,7 +786,7 @@ export default class Comp {
             }
           }, {resolveMsg: null, rejectMsg: null}).then((resu)=>{
 
-            console.log("-----------"+JSON.stringify(resu.data))
+            //tag)
             if(resu.data.code==200){
               Vue.showMessage("移除安检单成功! 成功移除:"+resu.data.res.up+"条"+(resu.data.res.noup>0?"有"+resu.data.res.noup+"条已经不是 ‘未检’ 状态！":""))
               this.searchUser(f)
@@ -806,7 +813,7 @@ export default class Comp {
     }
     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)
+    //tag
     if(res.data.length>0){
       Vue.showMessage("计划名称不能重复！")
       this.isSend=false
@@ -958,7 +965,7 @@ export default class Comp {
       }
     }
 
-console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
+//tag)
   }
   //返回遍历的option
   reoption(key1,key2){
@@ -1017,7 +1024,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
         columnName: "f_plan_id"
       }
     }, {resolveMsg: "删除成功！", rejectMsg: "删除失败！"})
-      console.log(JSON.stringify(res))
+      //tag)
     if(res.data.code==200){
       Vue.showMessage("删除成功！"+res.data.message,"success",2500)
       await  this.loadCheckPlan('',()=>{})
@@ -1032,7 +1039,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
   //修改计划时 用来存储当前选中要修改的计划
   plan={}
   setPlanVal(value){
-    console.log(value)
+    //tag
     this.plan=JSON.parse(JSON.stringify( value ))
   }
   setPlan(key,val){
@@ -1072,9 +1079,9 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
   }
 
 /*  getDataLength(modelname){
-    console.log("sdadasdasdasdadasdadddddddddddddddddddddddddddddddddddddddddddd")
+    //tag
     let l=this[modelname].list.data.length
-    console.log("--"+l)
+    //tag
     return l
   }*/
   //新建安检计划非空判断
@@ -1116,7 +1123,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
           this.suppplanitem["f_checker_id"]=this.checkerMess[i].id
         }
       }
-      //console.log(this.fdevices)
+      ////tag
     //return;
       this.suppplanitem["f_devices"]=this.fdevices
       this.suppplanitem.f_check_type=this.suppplanitem.f_user_type
@@ -1200,9 +1207,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")
+             // //tag
               for (let l = 0; l <fde[j].f_items.length ; l++) {
-               // console.log("11111111111111")
+               // //tag
                 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){
@@ -1247,7 +1254,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
         }
       }
     }
-//console.log(this.fdevices)
+////tag
   }
   getAreaList() {
     let res = this.http.load('POST', '/rs/sql/safe_singleTable_GroupBy', {
@@ -1330,7 +1337,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
         }
       }
       ,{resolveMsg: null, rejectMsg: null})
-    console.log("excel结果---"+JSON.stringify(res))
+    //tag)
     let link = document.createElement('a');
     let path = res.data[0].filename
     //webapps这个是在服务器上导出用的
@@ -1351,9 +1358,9 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       {data: {f_orgid: "('"+this.filialeid+"')"}},
       {resolveMsg: null, rejectMsg: '获取失败！！！'})
       this.cbc = [{label: '全部', value: '全部'}]
-      console.log('22222222222222222222222222222222222222')
-      console.log(JSON.stringify(getMeterReadingBooks))
-      console.log('22222222222222222222222222222222222222')
+      //tag
+      //tag)
+      //tag
       this.meterbooks=[]
       this.meterbooks=getMeterReadingBooks.data.meterbooks
       this.meterbooks.forEach((res) => {
@@ -1374,7 +1381,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       userid: global.login.id
       //userid:"15130"
     }, {resolveMsg: null, rejectMsg: '获取分公司出错！！！'})
-    console.log("分公司--"+JSON.stringify(orgs))
+    //tag)
     this.orgs = []
     if(orgs.data.length>0){
       orgs.data.forEach((res) => {
@@ -1395,18 +1402,24 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
       userid: global.login.id
     }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
       this.sliceArea = ['全部']
-      console.log('11111111111111111111111111111111111111')
-      console.log(getAllArea.data)
-      console.log('11111111111111111111111111111111111111')
+      //tag
+      //tag
+      //tag
       getAllArea.data.forEach((res) => {
         if(res.parentid==this.filialeid){
           this.sliceArea.push(res.name)
         }
       })
-      console.log('片区' + this.sliceArea)
+      //tag
+  }
+  show1(){
+    this.showModel=true
+  }
+  //清空用户编号
+  clearUserInfoId(){
+    this.setProperty("user","uploadCondition",'')
+    Vue.showMessage("已清空用户编号")
   }
-
-
 
   formatArrayFun(type,arr){
     arr.forEach((result)=>{

package/examples/SafePlan-shaoguan/App.vue

@@ -17,7 +17,7 @@ data(){
    try{
 
      if (this.$login) {
-       console.log('登录信息', this.$login.f)
+       //tag
        global.login=this.$login.f
      }
      this.comp=new Comp()
@@ -31,7 +31,7 @@ data(){
      loadWasm().then(()=> {
        global.stat = this.comp
        global.stat.ready().then(()=> {
-         console.log(global.stat)
+         //tag
          run()
          this.comp.isSend=false
        })

package/examples/SafePlan-shaoguan/TestData.js

@@ -412,11 +412,11 @@ export default class TestData {
   }
 
   addNewPlan(){
-    console.log("添加新计划")
+    //tag
   }
 
   cancel(){
-    console.log("取消")
+    //tag
   }
 
   //设置属性值
@@ -438,7 +438,7 @@ export default class TestData {
 
   //删除计划项
   delPlanItem = function () {
-    console.log("开始执行删除")
+    //tag
   }
   //新建计划
   addCheckPlan = function () {