safecheck-client 3.0.31-gongyi → 3.0.32-2

package/src/components/rongcheng/UploadPage.vue

@@ -121,7 +121,7 @@
         this.enableButton=true
         if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检')) {
           this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
-            console.log(JSON.stringify(response))
+            //tag)
             row['f_plan_meters'] = response.data
             let pardate = {
               _this:this,
@@ -143,8 +143,8 @@
       },
       // 上传所有未成功上传的数据
       async uploadAll() {
-        console.log(`this.model==>`+JSON.stringify(this.model))
-        console.log(`this.model.rows.length==>${this.model.length}`)
+        //tag)
+        //tag
         // if(this.model.rows.length <= 0){
         //   this.model.rows = this.result
         // }
@@ -179,20 +179,20 @@
       },
       upload(){
         this.uploadAll().then((res)=>{
-          console.log('批量上传执行结果===》'+JSON.stringify(res))
+          //tag)
           this.refresh()
         })
 
       },
       uploadCallBack(jo){
-        console.log('jo -->' + JSON.stringify(jo))
-        console.log('jo.state -->' + JSON.stringify(jo.state))
+        //tag)
+        //tag)
         let ret = JSON.parse(jo.result)
-        console.log('ret ===> '+ JSON.stringify(ret))
+        //tag)
         if(jo.state == 'ok'){
           //上传抄表信息
           HostApp.__this__ = this
-          console.log('当前this.model==>'+JSON.stringify(this.model))
+          //tag)
           //卡表无法调接口抄表。该方法已无用
           /*HostApp.logicWithHint({
             // logic别名，key必须为logic
@@ -215,17 +215,17 @@
 
       },
       handMeterCallback(jo){
-        console.log("jo------------+"+JSON.stringify(jo))
+        //tag)
       },
       // 查询所有未上传斌保存在手机上的数据
       // download() {
-      //   console.log(`Vue.user========>${Vue.user}`)
+      //   //tag
       //   let res = this.$androidUtil.bzLogic('getCheckPlanInfo',{condition:this.condition})
-      //   console.log(`res.data.data===>${res.data.data}`)
-      //   console.log(`res.data.code===>${res.data.code}`)
+      //   //tag
+      //   //tag
       //
       //   if (res.data && res.data.code === 200) {
-      //     console.log("查询到结果")
+      //     //tag
       //       if (res.data.data.length > 0) {
       //         this.context = `有${res.data.data.length}条数据未上传，请点击上传按钮，自动上传`
       //         this.resultdata  = [...res.data.data]
@@ -236,13 +236,13 @@
       //   }
       // },
       refresh() {
-        console.log("批量上传页面刷新")
+        //tag
         // hard code relationship
         let criteria = {
           condition: "f_safecheck_type='年度普检'",
         }
         let value  = HostApp._executeTask({'type':'sql', 'data':{'alias': 'AndroidGetCheckPlanItem', 'criteria': criteria}})
-        console.log("-------------"+JSON.stringify(value))
+        //tag)
         if(value.code && value.code == 200){
           if(value.data.rows.length > 0){
             this.model = value.data.rows
@@ -259,7 +259,7 @@
         }*/
         // //PC模拟安卓
         // this.$androidUtil.path({alias: 'getCheckPlan', data:{}}).then((value)=>{
-        //   console.log(value)
+        //   //tag
         //   if(value.data.length > 0){
         //     this.model = value.data
         //   }

package/src/components/rongcheng/checkerplan/SelectCheckPlan.vue

@@ -61,7 +61,7 @@
           <div style="float:right" :class="{'col-sm-3 form-group':$parent.$parent.$parent.showItem,'col-sm-2 form-group':!$parent.$parent.$parent.showItem}">
 
             <button type="button" style="float: right;margin: 0 5px" class="button_search button_spacing" @click="search()">查询</button>
-            <export-excel-safe   :data="$parent.$parent.searchData"
+            <export-excel-safe   :data="$parent.$parent.search_data"
                                  :field="$parent.$parent.excelHeaders"
                                  sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
             <div class="button_spacing" style="float: right;"
@@ -183,25 +183,18 @@
                   'lsdf':'临时到访不遇数',
                   'lsjj':'临时拒检数'
                 },
-              searchData:{
-
-                  condition:"1=1",
-                  f_plan_year:year[0],
-                  f_checker:'',
-                  f_filialeids:'('+this.$login.f.orgid+')'
-                }
-              ,
                 checker: this.$login.f,
                 checkers: [],
                 checkersname: [],
                 checkStates: this.$appdata.getParam('安检状态'),
                 f: this.$login.f,
                 model: model,
+                search_data:null,
                 c_year_list: options,
-              f_check_start:Util.toStartDateYearString(),
-              f_check_end: '',
-              f_start_time:Util.toStartDateYearString(),
-              f_end_time:''
+                f_check_start:Util.toStartDateYearString(),
+                f_check_end: '',
+                f_start_time:Util.toStartDateYearString(),
+                f_end_time:''
             }
         },
         methods: {
@@ -220,13 +213,16 @@
             //this.$dispatch('checkstatus-changed', this.$refs.paged.$refs.cri.model.f_last_check_state[0])
             this.model.params.f_start_time=this.f_start_time
             this.model.params.f_end_time=this.f_end_time
+            console.log('this.model---', this.model.params)
+            console.log('this.search_data---', this.search_data)
+            this.search_data=this.model.params
             this.model.search(args.condition, args.model)
-            console.log('this.model')
-            console.log(this.model.rows.length)
+            //tag
+            //tag
           },
           getRes(obj){
             this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-            console.log(this.model.f_filialeids)
+            //tag
           }
         },
         ready() {
@@ -237,19 +233,9 @@
         },
 
         watch: {
-          'model.condition'(val) {
-            if(val){
-              this.searchData.condition = val
-            }
-          },
-          'model.f_checker'(val) {
-            if(val){
-              this.searchData.f_checker = val
-            }
-          },
             'checker'() {
-                // console.log('1')
-                console.log("f_checker", this.checker)
+                // //tag
+                //tag
                 this.model.chosenOrg = this.checker[0]
             },
             'model.rows.length'() {
@@ -272,12 +258,12 @@
         },
         computed: {
             selected() {
-                // console.log('2')
+                // //tag
                 // this.$parent.showItem=!this.$parent.showItem
                 return this.$refs.paged.$refs.grid.selected
             },
             checked(){
-              console.log(this.model.sums.unchecked+"---"+this.model.sums.df+"----"+this.model.sums.jj)
+              //tag
               return this.model.sums.unchecked+this.model.sums.df+this.model.sums.jj
             }
         }

package/src/components/rongcheng/report/CheckPlanAreaList.vue

@@ -122,6 +122,15 @@
             <th>
               <nobr>到访不遇</nobr>
             </th>
+            <th>
+              <nobr>激光检漏</nobr>
+            </th>
+            <th>
+              <nobr>立杠保压</nobr>
+            </th>
+            <th>
+              <nobr>室外关阀</nobr>
+            </th>
             <th>
               <nobr>拒检</nobr>
             </th>
@@ -143,10 +152,13 @@
             <td style="text-align:center" :class="{'defectfront':row.f_plan_total==row.f_user_number,'td-0':row.f_checker_name==undefined,'td-1':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows.length!=($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows.length==($index+1)&&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>
             <td style="text-align:center" :class="{'defectfront':row.f_plan_total==row.f_user_number}" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_plan_total}}</td>
-            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_weijian+row.f_buyu+row.f_jujian}}</td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_weijian+row.f_buyu+row.f_jujian+row.f_jiguangjianlou+row.f_liganbaoya+row.f_shiwaiguanfa}}</td>
             <!--<td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_yijian}}</td>-->
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_ruhu}}</nobr></td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_buyu}}</nobr></td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_jiguangjianlou}}</nobr></td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_liganbaoya}}</nobr></td>
+            <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_shiwaiguanfa}}</nobr></td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center">{{row.f_jujian}}</td>
             <td :class="{'defectfront':row.f_plan_total==row.f_user_number}" style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
             <!--<td style="text-align: center;">-->
@@ -159,10 +171,13 @@
           <td  style="text-align:center"><strong>合计：</strong></td>
           <td  style="text-align:center" :colspan="$parent.$parent.$parent.nameForSql.length"></td>
           <td  style="text-align:center"><strong>{{model.sums.f_plan_total}}</strong></td>
-          <td  style="text-align:center"><strong>{{model.sums.f_weijian+model.sums.f_buyu+model.sums.f_jujian}}</strong></td>
+          <td  style="text-align:center"><strong>{{model.sums.f_weijian+model.sums.f_buyu+model.sums.f_jujian+model.sums.f_jiguangjianlou+model.sums.f_liganbaoya+model.sums.f_shiwaiguanfa}}</strong></td>
           <!--<td  style="text-align:center"><strong>{{model.sums.f_yijian}}</strong></td>-->
           <td  style="text-align:center"><nobr><strong>{{model.sums.f_ruhu}}</strong></nobr></td>
           <td  style="text-align:center"><nobr><strong>{{model.sums.f_buyu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_jiguangjianlou}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_liganbaoya}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_shiwaiguanfa}}</strong></nobr></td>
           <td  style="text-align:center"><strong>{{model.sums.f_jujian}}</strong></td>
           <td  style="text-align:center"><strong>{{model.sums.f_plan_total>0?(model.sums.f_ruhu/model.sums.f_plan_total*100).toFixed(2)+'%':0}}</strong></td>
           </tr >
@@ -183,7 +198,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
+        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jiguangjianlou:'',f_liganbaoya:'',f_shiwaiguanfa:'',f_jujian:''}),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
@@ -288,7 +303,7 @@
         for (var i=0;i<temp.length;i++){
 
           for (var j=0;j<this.nameForSql.length;j++){
-            console.log(temp[i],this.nameForSql[j],'asd')
+            //tag
             if(temp[i]==this.nameForSql[j]){
               newtemp.push(this.nameForSql[j])
             }
@@ -309,18 +324,18 @@
       //   this.getGroupName1()
       // },
       'model.rows'(){
-        console.log("this.model.rows发生变化")
+        //tag
         if(this.listflag){
           return;
         }
         this.listflag=true
-        console.log(this.model.rows)
+        //tag
         var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
         var newtemp=[]
         for (var i=0;i<temp.length;i++){
 
           for (var j=0;j<this.nameForSql.length;j++){
-            console.log(temp[i],this.nameForSql[j],'asd')
+            //tag
             if(temp[i]==this.nameForSql[j]){
               newtemp.push(this.nameForSql[j])
             }
@@ -336,22 +351,22 @@
           if(newtemp[i]=='f_user_number'){
             return;
           }
-          console.log(newtemp[i])
+          //tag
           var ss=''
           for (var j=0;j<temp.length;j++){
             if(j>0&&i>0){
               var flag=false
               for(var t=i-1;t>-1;t--){
-                console.log("jjjjjjjjjjj--:"+j)
-                console.log("iiiiiiiiiii---:"+i)
-                console.log("temp[j-1][newtemp[t]]:"+temp[j-1][newtemp[t]])
-                console.log("temp[j][newtemp[t]]:"+temp[j][newtemp[t]])
+                //tag
+                //tag
+                //tag
+                //tag
                 if(temp[j-1][newtemp[t]]!=temp[j][newtemp[t]]&&temp[j][newtemp[t]].indexOf('*&')==-1){
                   flag=true
                   break
                 }
               }
-               console.log(j,i,flag)
+               //tag
               if(flag){
                 ss=temp[j][newtemp[i]]
                 continue
@@ -364,7 +379,7 @@
             }
         }
       }
-      console.log(temp,'chulijieshu')
+      //tag
       this.model.rows=JSON.parse(JSON.stringify(temp))
       },
       'model.rows.length'() {
@@ -375,6 +390,9 @@
           this.model.sums.f_yijian = 0
           this.model.sums.f_ruhu = 0
           this.model.sums.f_buyu = 0
+          this.model.sums.f_jiguangjianlou= 0
+          this.model.sums.f_liganbaoya = 0
+          this.model.sums.f_shiwaiguanfa = 0
           this.model.sums.f_jujian = 0
         }
       }

package/src/components/rongcheng/report/CheckPlanUserList.vue

@@ -164,14 +164,14 @@
         if(!this.checkrow){
           return
         }
-        console.log('--------------')
+        //tag
         // args.condition = `${args.condition} and f_price_id = '${this.priceid}'`
-        console.log(this.checkrow,this.$parent.$refs.list,'cew')
+        //tag
         var cc = this.$parent.$refs.list.model.condition
-        console.log(cc)
+        //tag
         this.condition = args.condition
         args.condition=args.condition+' and '+ cc
-        console.log( this.condition,args.condition)
+        //tag
         var self=this
         this.$parent.$refs.list.nameForSql.forEach(function (s) {
 
@@ -208,10 +208,10 @@
         this.model.params.endyear=this.$parent.$refs.list.model.params.endyear
         this.model.params.endmon=this.$parent.$refs.list.model.params.endmon
         this.model.params.f_user_type=this.$parent.$refs.list.model.params.f_user_type
-        console.log( this.condition,args.condition)
-        console.log('==============================')
-        console.log(this.$refs.paged.model)
-        console.log(this.$refs.paged.model.condition)
+        //tag
+        //tag
+        //tag
+        //tag
         this.model.search(args.condition, args.model)
       },
       dealmsg (val) {

package/src/components/safecheck/common/TabButton.vue

@@ -58,7 +58,7 @@
     },
     ready () {
       remove.$on('remove', (name) => {
-        console.log('tabset收$on 到的名字为：', name)
+        //tag
         this.$removeTab(name)
       })
     },
@@ -72,8 +72,8 @@
     methods: {
       handleTabListClick (index, el) {
         // 没有打开过, 则添加显示
-        console.log("拿到的值")
-        console.log(index,el)
+        //tag
+        //tag
         if (!this.$parent.show.includes(el.header)) {
           this.$parent.show.push(el.header)
         }

package/src/components/safecheck/queryManage/CheckBookAll.vue

@@ -1,23 +1,26 @@
 <template>
   <tab-button v-ref:list :active="-1">
-    <tabs header="安检册管理">
-      <check-book v-if="show.includes('安检册管理')" @deal-msg="dealMsg" :permission="permission" v-ref:papermain></check-book>
+    <tabs header="居民用户台账">
+      <check-book v-if="show.includes('居民用户台账')" @deal-msg="dealMsg" v-ref:papermain :showtype="'民用'"></check-book>
     </tabs>
-    <tabs header="用户管理">
-        <check-book-manage v-if="show.includes('用户管理')" :permission="permission" @deal-msg="dealMsg"></check-book-manage>
+    <tabs header="非居民用户台账">
+      <check-book v-if="show.includes('非居民用户台账')" @deal-msg="dealMsg" v-ref:paperfeimain :showtype="'非民用'"></check-book>
     </tabs>
+<!--    <tabs header="用户管理">-->
+<!--        <check-book-manage v-if="show.includes('用户管理')" @deal-msg="dealMsg"></check-book-manage>-->
+<!--    </tabs>-->
   </tab-button>
 
 </template>
 
 <script>
-import TabButton from '../common/TabButton'
-import Tabs from '../common/Tabs'
+import TabButton from '../../safecheck/common/TabButton'
+import Tabs from '../../safecheck/common/Tabs'
 // import { HttpResetClass } from 'vue-client'
 
 export default {
   name: 'checkBookAll',
-  title: '安检册',
+  title: '用户台账管理',
   data() {
     return {// 页面开关
       residentialArea: [],
@@ -33,18 +36,11 @@ export default {
     }
   },
   components: {Tabs, TabButton},
-  ready () {
-    console.log(this.$refs.list)
-    console.log(this.$login.f.f_role_name)
-    console.log('业务查询')
-    console.log('permission1',this.permission)
-    this.$refs.list.handleTabListClick(0, this.$refs.list.renderData[0])
-  },
-  computed: {
-    permission () {
-      // c1管理员权限，c2科室管理员权限，c3无权限
-      return this.$login.f.f_role_name.indexOf('安检管理员') !== -1 ? 'c1' : (this.$login.f.f_role_name.indexOf('安检册二次分配') !== -1 ? 'c2' : 'c3')
-    }
+  ready() {
+    //tag
+    //tag
+    //tag
+    this.$refs.list.handleTabListClick(0,this.$refs.list.renderData[0])
   },
   methods: {
     // permission(name) {

package/src/components/safecheck/queryManage/SafeCheckManage.vue

@@ -58,9 +58,9 @@ export default {
   },
   components: {Tabs, TabButton},
   ready() {
-    console.log(this.$refs.list)
-    console.log(this.$login)
-    console.log('业务查询')
+    //tag
+    //tag
+    //tag
     this.$refs.list.handleTabListClick(0,this.$refs.list.renderData[0])
   },
   methods: {

package/src/components/sendsingle/EquipmentManagement.vue

@@ -269,10 +269,10 @@ export default {
     // 选择tab
     tabSelect(item, number) {
       this.header = item.header
-      console.log('item', item)
-      console.log('number', number)
-      console.log('this.routeShow', this.routeShow)
-      console.log('this.number', this.number)
+      //tag
+      //tag
+      //tag
+      //tag
       // 处理关闭/显示 内容
       if (this.number == number && !this.routeShow) {
         this.routeShow = true
@@ -283,14 +283,14 @@ export default {
       }
       this.number = number
       this.componentName = item.complete
-      console.log('跳转前this.routeShow', this.routeShow)
+      //tag
 
-      console.log('this.data', this.data)
+      //tag
       if (item.header != '燃气表' && this.data['device' + item.number].length == 0) {
         this.data['device' + item.number].push({})
       }
-      console.log('length', this.data['device' + item.number])
-      console.log('this.data[\'device\' + item.number] ===> ' + JSON.stringify(this.data['device' + item.number]))
+      //tag
+      //tag)
       let idx = this.data['device' + item.number].length - 1
       let itemprops = {
         config: this.config,
@@ -298,13 +298,13 @@ export default {
         idx: idx,
         role: 'inspect'
       }
-      console.log('tabSelect函数中赋值')
-      console.log(JSON.stringify(itemprops))
-      console.log('itemprops.device ===> ' + JSON.stringify(itemprops.device))
-      console.log('item.complete', item.complete)
+      //tag
+      //tag)
+      //tag)
+      //tag
       if (this.routeShow) {
         this.$goto(item.complete, itemprops, 'repair')
-        console.log('跳转完成')
+        //tag
       }
       this.shupingshow = true
     },
@@ -319,22 +319,22 @@ export default {
       }
     },
     addEquipment() {
-      console.log("进入添加设备方法")
+      //tag
       this.modelshow = true
     },
     upEquipment() {
 
-      console.log("进入保存设备方法")
+      //tag
       let codata = this.upinit()
-      console.log("555555555555555555555555")
-      console.log(JSON.stringify(codata))
+      //tag
+      //tag)
       this.$showMessage('请确认是否保存设备信息', ['cancel', 'confirm']).then(res => {
         if (res == 'confirm') {
-          console.log("进入开始保存")
+          //tag
           new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/sendShebei`, {shebei: codata}).then(res => {
             if (res.data.code == '200') {
               this.$showMessage("提交成功")
-              console.log('上传结束back')
+              //tag
               this.$dispatch('confirm')
             } else {
               this.$showMessage("提交失败," + res.data.msg)
@@ -352,14 +352,14 @@ export default {
     upinit() {
       let saveall = []
       for (let i = 0; i < this.indexcount; i++) {
-        console.log("8888888888")
-        console.log(JSON.stringify(this.data['device' + i]))
+        //tag
+        //tag)
         let items = this.data['device' + i][0].f_items
 
         let state = items[8].f_item_value ? (items[8].f_item_value[0] ? items[8].f_item_value[0] : '') : ''
         if (state != '删除') {
-          console.log("5555555555555555555555555555")
-          console.log(JSON.stringify(items))
+          //tag
+          //tag)
               if (this.devices[i].id){
                 saveall.push({
                   id:this.devices[i].id,
@@ -414,8 +414,8 @@ export default {
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
         for (let i = 0; i < res.data.length; i++) {
           for (let j = 0; j < this.model.serviceacitivity[0].imgs.length; j++) {
-            console.log(res.data[i].id.toString())
-            console.log(this.model.serviceacitivity[0].imgs[j].imgid)
+            //tag)
+            //tag
             if (res.data[i].id.toString() === this.model.serviceacitivity[0].imgs[j].imgid) {
               this.model.serviceacitivity[0].imgs[j] = Object.assign({}, res.data[i], this.model.serviceacitivity[0].imgs[j])
             }
@@ -452,8 +452,8 @@ export default {
 
 
   ready() {
-    console.log("设备管理页面开始初始化数据")
-    console.log(JSON.stringify(this.item))
+    //tag
+    //tag)
 
     for (let i = 0; i < this.item.shebei.length; i++) {
       this.tabs.push({