safecheck-client 3.0.31-gongyi → 3.0.32-2

package/src/components/planmanage/checkUserList.vue

@@ -111,35 +111,6 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">气表品牌:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.gasbrand"
-                      v-model="model.gasbrand"
-                      :options='$parent.$parent.getgasbrand'
-                      placeholder='请选择'
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">气表型号:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.gasmodel"
-                      v-model="model.gasmodel"
-                      :options='$parent.$parent.getgasmodel'
-                      placeholder='请选择'
-                      condition="uf.f_gasmodel_id = {}"
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
                   <!--<div class="form-group col-sm-4" >
                     <label class="font_normal_body">小区名称:</label>
                     <input type="text" class="input_search" v-model="model.f_userinfo_code"
@@ -155,6 +126,11 @@
                     <input type="text" class="input_search" v-model="model.f_unit"
                            style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">楼&ensp;层&ensp;号:</label>
+                    <input type="text" class="input_search" v-model="model.f_floor"
+                           style="width: 60%" placeholder="请选择" condition="ua.f_floor='{}'">
+                  </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">开户起始:</label>
                     <datepicker
@@ -178,13 +154,18 @@
                       :show-rest-button="reset"
                       :value.sync="model.f_endfile_time"
                       v-model="model.f_endfile_time"
-                      condition="ui.f_createfile_date <= '{} 00:00:00'">
+                      condition="ui.f_createfile_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">表&ensp;箱&ensp;号:</label>
                     <input type="text" class="input_search" v-model="model.f_metertitles"
-                           style="width: 60%" placeholder="请选择" condition="uf.f_metertitles='{}'">
+                           style="width: 60%" placeholder="请输入" condition="uf.f_metertitles='{}'">
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">用户电话:</label>
+                    <input type="text" class="input_search" v-model="model.f_user_phone"
+                           style="width: 60%" placeholder="请输入" condition="ui.f_user_phone='{}'">
                   </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">片&ensp;&ensp;&ensp;&ensp;区:</label>
@@ -231,50 +212,99 @@
                     </v-select>
                   </div>
                   <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">房屋类型:</label>
+                    <label class="font_normal_body">安检起始:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      style="width:60%"
+                      :disabled-days-of-week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_start_time"
+                      v-model="model.f_start_time"
+                   >
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检截止:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      :disabled-days-of-week="[]"
+                      style="width:60%"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_end_time"
+                      v-model="model.f_end_time"
+                      >
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4">
+                    <label class="font_normal_body">安检状态:</label>
                     <v-select
                       class="select select_list"
-                      :value.sync="model.f_house_type"
-                      v-model="model.f_house_type"
-                      :options='$parent.$parent.housetype'
+                      :value.sync="model.f_last_check_state"
+                      v-model="model.f_last_check_state"
+                      :options='$parent.$parent.entry_status'
                       placeholder='请选择'
-                      close-on-select
-                      condition="ui.f_house_type='{}'"
                       :search="false"
+                      close-on-select
                       value-single
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">安装位置:</label>
+                  <div class="form-group col-sm-4" v-if="$parent.$parent.hasCheckBooks == '是'">
+                    <label class="font_normal_body">安检册:</label>
                     <v-select
                       class="select select_list"
-                      :value.sync="model.f_position"
-                      v-model="model.f_position"
-                      :options='$parent.$parent.positions'
-                      condition="uf.f_position='{}'"
+                      :value.sync="model.checkBook"
+                      v-model="model.checkBook"
+                      :options='$parent.$parent.checkBooks'
                       placeholder='请选择'
-                      close-on-select
                       :search="false"
+                      close-on-select
                       value-single
                     >
                     </v-select>
                   </div>
                   <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">使用类型:</label>
+                    <label class="font_normal_body">通气起始:</label>
+                    <datepicker
+                      placeholder='通气开始时间'
+                      style="width:60%"
+                      :disabled-days-of-week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_startgas_time"
+                      v-model="model.f_startgas_time"
+                      condition="ui.f_uservent_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">通气截止:</label>
+                    <datepicker
+                      placeholder='通气结束时间'
+                      :disabled-days-of-week="[]"
+                      style="width:60%"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_endgas_time"
+                      v-model="model.f_endgas_time"
+                      condition="ui.f_uservent_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
+                  <!--<div class="form-group col-sm-4" >
+                    <label class="font_normal_body">入户情况:</label>
                     <v-select
                       class="select select_list"
-                      :value.sync="model.f_usetype"
-                      v-model="model.f_usetype"
-                      :options='$parent.$parent.usetype'
-                      condition="uf.f_usetype='{}'"
+                      :value.sync="model.f_hasHousehold"
+                      v-model="model.f_hasHousehold"
+                      :options='$parent.$parent.hasHousehold'
                       placeholder='请选择'
                       close-on-select
                       :search="false"
                       value-single
                     >
                     </v-select>
-                  </div>
+                  </div>-->
 
                 </div>
               </div>
@@ -320,6 +350,8 @@
             <th><nobr>用户编号</nobr></th>
             <th><nobr>用户名称</nobr></th>
             <th><nobr>用户类型</nobr></th>
+            <th><nobr>用户电话</nobr></th>
+            <th><nobr>表具类型</nobr></th>
             <th><nobr>小区名称</nobr></th>
             <th><nobr>片区</nobr></th>
             <th><nobr>抄表册</nobr></th>
@@ -333,6 +365,8 @@
           <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_user_type}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_phone}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_meter_classify}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_book_slice_area}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_book_name}}</nobr></td>
@@ -350,311 +384,325 @@
   import * as Util from "../Util";
   import Vue from "vue";
 
-    export default {
-        name: "PlanManage",
-        title: '计划管理',
-        data() {
-          return {
-            model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
-              "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":"''"}),
-            a:'1',
-            opt:[{label:"测试",value:"测试"}],
-            showCondtion:false,
-            userTypes:[],//用户类型
-            userStates:[],//用户状态
-            gasproperties:[],//用气性质
-            meter_classifys:[],//气表类型
-            hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
-            yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
-            sliceArea:[],
-            meterbooks:[],
-            cbc:[],
-            areaList:[],
-            checkAll:false,
-            checkes:[],
-            excelUserCondtion:false,
-            uploadCodeCondition:'',
-            housetype: [{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
-            positions: [],
-            usetype: [],
-            meterbrands:[]
-          }
-        },
-        props:["selectplan","userlogin"],
-        ready(){
-          this.$refs.paged.$refs.criteria.model.f_user_state='正常'
-          this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
-          //this.$refs.paged.$refs.criteria.model.f_hasHousehold='未入户'
-          this.setConList()
-          this.loadpage()
-        },
-        methods: {
-          loadpage(){
-            this.select_search()
-            this.Mreadibook()
-            this.getSliceArea()
-          },
-          cancel(){
-            this.showCondtion=false
-            this.excelUserCondtion=false
-          },
-          //清空用户编号
-          clearUserInfoId(){
-            this.uploadCodeCondition=''
-            Vue.showMessage("已清空用户编号")
-          },
-          showUploadCodeCondition(){
-            this.excelUserCondtion=true
-          },
-          selfSearch (args) {
-            console.log("------------"+JSON.stringify(args.model))
-            args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
-            /*if(args.model.f_hasHousehold=='已入户'){
-              args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
-            }else if(args.model.f_hasHousehold=='未入户'){
-              args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
-            }*/
-            if(this.uploadCodeCondition){
-              args.condition +=` and ${this.uploadCodeCondition}`
-            }
-            if(args.model.gasbrand){
-              args.condition +=` and f_gasbrand_id=${args.model.gasbrand.id}`
-            }
-            this.cancel()
-            this.checkes=[]
-            this.checkAll=false
-            this.model.search(args.condition, args.model, args.condValue)
-          },
-            showUserCondition(){
-              this.showCondtion=true
-            },
-            setConList(){
-              new HttpResetClass().load("POST", `/rs/logic/getSaleInitData`, {data:{f_orgid:`${this.$login.f.orgid}`}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
-                console.log('请求yingshoucanshu发送完成！！！！！'+JSON.stringify(res))
-                this.meterbrands=res.data.gasbrands
-              })
-              this.userTypes=this.$appdata.getParam('用户类型') ? [{
-                label: '全部',
-                value: ''
-              }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
+  export default {
+    name: "PlanManage",
+    title: '计划管理',
+    data() {
+      return {
+        model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
+          "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":"''"}),
+        a:'1',
+        opt:[{label:"测试",value:"测试"}],
+        showCondtion:false,
+        userTypes:[],//用户类型
+        userStates:[],//用户状态
+        gasproperties:[],//用气性质
+        meter_classifys:[],//气表类型
+        hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
+        yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
+        entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
+        sliceArea:[],
+        meterbooks:[],
+        hasCheckBooks:'否',
+        checkBooks:[],
+        cbc:[],
+        areaList:[],
+        checkAll:false,
+        checkes:[],
+        excelUserCondtion:false,
+        uploadCodeCondition:''
+      }
+    },
+    props:["selectplan","userlogin"],
+    ready(){
+      this.$refs.paged.$refs.criteria.model.f_user_state='正常'
+      this.hasCheckBooks=this.$appdata.getSingleValue('是否使用安检册')
+      // this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
+      //this.$refs.paged.$refs.criteria.model.f_hasHousehold='未入户'
+      this.getCheckBook()
+      this.setConList()
+      this.loadpage()
 
-              this.userStates=this.$appdata.getParam('安检用户状态') ? [...this.$appdata.getParam('安检用户状态')] : []
-              this.gasproperties=this.$appdata.getParam('用气性质') ? [{
-                label: '全部',
-                value: ''
-              }, ...this.$appdata.getParam('用气性质')] : [{label: '全部', value: ''}]
-              this.meter_classifys=this.$appdata.getParam('气表类型') ? [{
-                label: '全部',
-                value: ''
-              }, ...this.$appdata.getParam('气表类型')] : [{label: '全部', value: ''}]
+    },
+    methods: {
+      getCheckBook(){
+        this.checkBooks=[]
+        new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+          data: {
+            items: 'id,f_check_book_name,f_check_book_type',
+            tablename: 't_check_book',
+            condition: `f_orgid = '${this.userlogin.orgid}'`,
+            orderitem: 'id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          this.checkBooks.push({label: '全部', value: ''})
+          res.data.forEach(ress => {
+            this.checkBooks.push({
+              label: ress.f_check_book_name,
+              value: `${ress.id}-${ress.f_check_book_type}`
+            })
+          })
+        })
+      },
+      loadpage(){
+        this.select_search()
+        this.Mreadibook()
+        this.getSliceArea()
+      },
+      cancel(){
+        this.showCondtion=false
+        this.excelUserCondtion=false
+      },
+      //清空用户编号
+      clearUserInfoId(){
+        this.uploadCodeCondition=''
+        Vue.showMessage("已清空用户编号")
+      },
+      showUploadCodeCondition(){
+        this.excelUserCondtion=true
+      },
+      selfSearch (args) {
+        //tag)
+        args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
+        /*if(args.model.f_hasHousehold=='已入户'){
+          args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
+        }else if(args.model.f_hasHousehold=='未入户'){
+          args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
+        }*/
 
-              this.positions=this.$appdata.getParam('安装位置') ? [{
-                label: '全部',
-                value: ''
-              }, ...this.$appdata.getParam('安装位置')] : [{label: '全部', value: ''}]
+        if (args.model.f_last_check_state == '未检') {
+          let nocheckcon = 'and ( ui.f_last_check_date is null '
+          if(args.model.f_start_time){
+            nocheckcon += ` or ui.f_last_check_date <='${args.model.f_start_time} 00:00:00' `
+          }
+          if(args.model.f_end_time){
+            nocheckcon += ` or ui.f_last_check_date >='${args.model.f_end_time} 23:59:59' `
+          }
+          nocheckcon += ')'
+          args.condition +=  nocheckcon
+        }else{
+          if(args.model.f_last_check_state){
+            args.condition += ` and ui.f_last_check_state  = '${args.model.f_last_check_state}'`
+          }
+          if(args.model.f_start_time){
+            args.condition += ` and ui.f_last_check_date >='${args.model.f_start_time} 00:00:00' `
+          }
+          if(args.model.f_end_time){
+            args.condition += ` and ui.f_last_check_date <='${args.model.f_end_time} 23:59:59' `
+          }
+        }
 
-              this.usetype=this.$appdata.getParam('使用类型') ? [{
-                label: '全部',
-                value: ''
-              }, ...this.$appdata.getParam('使用类型')] : [{label: '全部', value: ''}]
-            },
-          select_search(text){
-            console.log("----------------"+text)
-              let pcdText=text?` and f_residential_area like '%${text}%'`:''
-              new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
-                //console.log('请求发送完成！！！！！'+JSON.stringify(res))
-                this.areaList=[]
-                if(res.data.length>0){
-                  this.areaList.push({label:"全部",value:""})
-                  res.data.forEach((result)=>{
-                    this.areaList.push({label:result.f_residential_area,value:result.f_residential_area})
-                  })
-                }
+        if(args.model.checkBook){
+          let arr=args.model.checkBook.split('-')
+          if(arr[1] == '用户'){
+            args.condition +=` and ua.f_check_book_id='${arr[0]}'`
+          }else{
+            args.condition +=` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
+          }
+        }
+        if(this.uploadCodeCondition){
+          args.condition +=` and ${this.uploadCodeCondition}`
+        }
+        this.cancel()
+        this.checkes=[]
+        this.checkAll=false
+        this.model.search(args.condition, args.model, args.condValue)
+      },
+      showUserCondition(){
+        this.showCondtion=true
+      },
+      setConList(){
+        this.userTypes=this.$appdata.getParam('用户类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
 
-              })
-          },
-          //获取抄表册
-          async Mreadibook(){
-            this.cbc=[]
-            this.sliceArea=[]
-            let http = new HttpResetClass()
-            let getMeterReadingBooks = await http.load('POST','rs/logic/getMeterBooksData',
-              {data: {f_orgid: "('"+this.userlogin.orgid+"')"}},
-              {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)
-                }
-              }*/
+        this.userStates=this.$appdata.getParam('安检用户状态') ? [...this.$appdata.getParam('安检用户状态')] : []
+        this.gasproperties=this.$appdata.getParam('用气性质') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用气性质')] : [{label: '全部', value: ''}]
+        this.meter_classifys=this.$appdata.getParam('气表类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('气表类型')] : [{label: '全部', value: ''}]
+      },
+      select_search(text){
+        //tag
+        let pcdText=text?` and f_residential_area like '%${text}%'`:''
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          //tag)
+          if(res.data.length>0){
+            this.areaList=[]
+            this.areaList.push({label:"全部",value:""})
+            res.data.forEach((result)=>{
+              this.areaList.push({label:result.f_residential_area,value:result.f_residential_area})
             })
+          }
+          //tag)
+        })
+      },
+      //获取抄表册
+      async Mreadibook(){
+        this.cbc=[]
+        this.sliceArea=[]
+        let http = new HttpResetClass()
+        let getMeterReadingBooks = await http.load('POST','rs/logic/getMeterBooksData',
+          {data: {f_orgid: "('"+this.userlogin.orgid+"')"}},
+          {resolveMsg: null, rejectMsg: '获取失败！！！'})
+        this.cbc = [{label: '全部', value: ''}]
+        //tag
+        //tag)
+        //tag
+        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 getSliceArea()  {
-            let http = new HttpResetClass()
-            let getAllArea = await http.load('POST', '/rs/search', {
-              source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-              userid: this.userlogin.id
-            }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-            this.sliceArea = [{label: '全部', value: ''}]
-            console.log('11111111111111111111111111111111111111')
-            console.log(getAllArea.data)
-            console.log('11111111111111111111111111111111111111')
-            getAllArea.data.forEach((res) => {
-              if(res.parentid==this.userlogin.orgid){
-                this.sliceArea.push({label:res.name,value:res.name})
-              }
-            })
-            console.log('片区' + this.sliceArea)
-          },
-          //片区改变-对应抄表册下拉重新赋值
-          slice_areaChange(value) {
-            console.log("下拉改变--"+value)
-              if(!value){
-                this.cbc=[]
-                this.meterbooks.forEach((res) => {
-                  this.cbc.push({label: res.f_book_name, value: res.id})
-                })
-              }else{
-                this.cbc=[]
-                this.meterbooks.forEach((res) => {
-                  if(res.f_book_slice_area==value){
-                    this.cbc.push({label: res.f_book_name, value: res.id})
-                  }
-                })
-              }
-          },
-          isChecked(v) {
-            // 如果全选，不在的按选中算，否则，在的按选中算
-            if (this.checkAll) {
-              return this.checkes.indexOf(v) == -1
-            } else {
-              return this.checkes.indexOf(v) != -1
+      },
+      //片区获取
+      async getSliceArea()  {
+        let http = new HttpResetClass()
+        let getAllArea = await http.load('POST', '/rs/search', {
+          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+          userid: this.userlogin.id
+        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+        this.sliceArea = [{label: '全部', value: ''}]
+        //tag
+        //tag
+        //tag
+        getAllArea.data.forEach((res) => {
+          if(res.parentid==this.userlogin.orgid){
+            this.sliceArea.push({label:res.name,value:res.name})
+          }
+        })
+        //tag
+      },
+      //片区改变-对应抄表册下拉重新赋值
+      slice_areaChange(value) {
+        //tag
+        if(!value){
+          this.cbc=[]
+          this.meterbooks.forEach((res) => {
+            this.cbc.push({label: res.f_book_name, value: res.id})
+          })
+        }else{
+          this.cbc=[]
+          this.meterbooks.forEach((res) => {
+            if(res.f_book_slice_area==value){
+              this.cbc.push({label: res.f_book_name, value: res.id})
             }
-          },
-          setCheckAll() {
-            this.checkAll=this.checkAll?false:true;
-            // 全选改变后，清空选中数据
-            this.checkes = []
-          },
-          setCheckes(id) {
-            let index=this.checkes.indexOf(id)
-            if(index<0){
-              this.checkes.push(id)
+          })
+        }
+      },
+      isChecked(v) {
+        // 如果全选，不在的按选中算，否则，在的按选中算
+        if (this.checkAll) {
+          return this.checkes.indexOf(v) == -1
+        } else {
+          return this.checkes.indexOf(v) != -1
+        }
+      },
+      setCheckAll() {
+        this.checkAll=this.checkAll?false:true;
+        // 全选改变后，清空选中数据
+        this.checkes = []
+      },
+      setCheckes(id) {
+        let index=this.checkes.indexOf(id)
+        if(index<0){
+          this.checkes.push(id)
+        }else{
+          this.checkes.splice(index,1)
+        }
+      },
+      //将客户信息拖至计划中
+      async dragtoPlanItem() {
+        if(this.model.rows.length==0){
+          Vue.showMessage("未检测到列表中有用户！")
+          return
+        }
+        if(!this.checkAll && this.checkes.length==0){
+          Vue.showMessage("请先勾选你要添入到上方计划中的用户！")
+          return
+        }
+        if(this.selectplan && this.selectplan.id){
+          this.$parent.isSend=true
+          try{
+            let res=await new HttpResetClass().load("POST", "/rs/logic/AddCheckPlanItem", {
+              data:{
+                f_operator:this.userlogin.name,
+                f_plan_id:this.selectplan.id,
+                f_safecheck_type:this.selectplan.f_safecheck_type,
+                f_filialeid:this.userlogin.orgid,
+                f_subscribe_date:'',
+                condition:this.model.condition,
+                switchCheckAll:true,
+                checkAll:this.checkAll,
+                param:this.checkes,
+                columnName: "ua.id"
+              }
+            }, {resolveMsg: null, rejectMsg: null})
+            //tag+"---"+res.data.result.length)
+            this.$parent.isSend=false
+            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)
+              this.$showMessage("添加成功！"+(res.data.result.length>0?"有"+res.data.result.length+"条用户地址已经存在于其他计划中":""))
+              this.$parent.refresh()
             }else{
-              this.checkes.splice(index,1)
+              this.$showMessage("添加失败！")
             }
-          },
-          //将客户信息拖至计划中
-          async dragtoPlanItem() {
-              if(this.model.rows.length==0){
-                Vue.showMessage("未检测到列表中有用户！")
-                return
-              }
-              if(!this.checkAll && this.checkes.length==0){
-                Vue.showMessage("请先勾选你要添入到上方计划中的用户！")
-                return
-              }
-              if(this.selectplan && this.selectplan.id){
-                this.$parent.isSend=true
-                try{
-                  let res=await new HttpResetClass().load("POST", "/rs/logic/AddCheckPlanItem", {
-                    data:{
-                      f_operator:this.userlogin.name,
-                      f_plan_id:this.selectplan.id,
-                      f_safecheck_type:this.selectplan.f_safecheck_type,
-                      f_filialeid:this.userlogin.orgid,
-                      f_subscribe_date:'',
-                      condition:this.model.condition,
-                      switchCheckAll:true,
-                      checkAll:this.checkAll,
-                      param:this.checkes,
-                      columnName: "ua.id"
-                    }
-                  }, {resolveMsg: null, rejectMsg: null})
-                  console.log("重复数量-"+JSON.stringify(res.data.result)+"---"+res.data.result.length)
-                  this.$parent.isSend=false
-                  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)
-                    this.$showMessage("添加成功！"+(res.data.result.length>0?"有"+res.data.result.length+"条用户地址已经存在于其他计划中":""))
-                    this.$parent.refresh()
-                  }else{
-                    this.$showMessage("添加失败！")
-                  }
-                }catch (e) {
-                  this.$showMessage("添加失败！")
-                }
-              }else{
-                this.$parent.isSend=false
-                this.$showMessage("请先打开一个计划再进行操作")
-              }
-          }
-        },
-      computed:{
-        getgasbrand(){
-          let ops=[{label:'全部',value:''}]
-          this.meterbrands.forEach(b =>{
-            ops.push({label:b.f_meter_brand,value:b})
-          })
-          return ops
-        },
-        getgasmodel(){
-          //console.log('-----为什么不触发？')
-          let ops=[{label:'全部',value:''}]
-          this.$refs.paged.$refs.criteria.model.gasmodel=''
-          if(this.$refs.paged.$refs.criteria.model && this.$refs.paged.$refs.criteria.model.gasbrand){
-            //console.log('-----为什么不触发？---------------------------'+JSON.stringify(this.$refs.paged.$refs.criteria.model.gasbrand.gasmodel))
-            this.$refs.paged.$refs.criteria.model.gasbrand.gasmodel.forEach(b =>{
-              ops.push({label:b.f_meter_style,value:b.id})
-            })
+          }catch (e) {
+            this.$showMessage("添加失败！")
           }
-          return ops
+        }else{
+          this.$parent.isSend=false
+          this.$showMessage("请先打开一个计划再进行操作")
+        }
+      }
+    },
+    events: {
+      onFileUpload: function (file, res) {
+        //tag)
+        //tag)
+        let data = {
+          filepath: res.f_downloadpath
         }
+        new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
+          resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
+          rejectMsg: '导入失败'
+        }).then((res) => {
+          this.uploadCodeCondition=res.data.condition
+          this.excelUserCondtion = false
+        })
       },
-      events: {
-        onFileUpload: function (file, res) {
-          console.log("-------------"+JSON.stringify(res))
-          console.log("-file------------"+JSON.stringify(file))
-          let data = {
-            filepath: res.f_downloadpath
-          }
-          new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
-            resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
-            rejectMsg: '导入失败'
-          }).then((res) => {
-            this.uploadCodeCondition=res.data.condition
-            this.excelUserCondtion = false
-          })
-        },
 
-      }
     }
+  }
 </script>
 
 <style scoped>
-.safe-planfont{
-  font-family: MicrosoftYaHei;
-  font-size: 15px;
-  font-weight: normal;
-  font-stretch: normal;
-  letter-spacing: 2px;
-  color: #333333;
-  line-height: 25px;
-}
+  .safe-planfont{
+    font-family: MicrosoftYaHei;
+    font-size: 15px;
+    font-weight: normal;
+    font-stretch: normal;
+    letter-spacing: 2px;
+    color: #333333;
+    line-height: 25px;
+  }
   .safe-bodyfont{
     font-family: MicrosoftYaHei;
     font-size: 14px;