safecheck-client 3.0.33-3 → 3.0.33-31

package/src/filiale/fugou/pc/checkUserList.vue

@@ -22,13 +22,13 @@
               <v-select
                 class="select select_list"
                 :width="'95%'"
-                :value.sync="model.f_area"
-                v-model="model.f_area"
+                :value.sync="model.f_check_book_id"
+                v-model="model.f_check_book_id"
                 :options='$parent.$parent.areaList'
                 :timeout="500"
                 @select-search="$parent.$parent.select_search"
                 placeholder='安检册筛选'
-                condition="ua.f_residential_area = '{}'"
+                condition="ua.f_check_book_id ='{}'"
                 close-on-select
                 value-single
               >
@@ -81,35 +81,33 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">片&ensp;&ensp;&ensp;&ensp;区:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_book_slice_area"
-                      v-model="model.f_book_slice_area"
-                      :options='$parent.$parent.sliceArea'
-                      @change="$parent.$parent.slice_areaChange(model.f_book_slice_area)"
-                      placeholder='请选择'
-                      condition="ua.f_slice_area  ='{}'"
-                      close-on-select
-                      value-single
-                    >
+                  <div class="col-sm-3 form-group">
+                    <label class="font_normal_body">街道/乡镇</label>
+                    <v-select :value.sync="model.f_street_id" :value-single="true"
+                              :options='$parent.$parent.streetslist' placeholder='请选择'
+                              condition=" area.f_street_id = '{}'"
+                              v-model='model.f_street_id'
+                              @change="$parent.$parent.streetChange"
+                              close-on-select :search="true" >
                     </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_pcd"
-                           style="width: 60%" placeholder="小区名称" condition="f_pcd like '%{}%'">
-                  </div>
-                  <div class="form-group col-sm-4" >
-                    <label class="font_normal_body">街道/乡镇:</label>
-                    <input type="text" class="input_search" v-model="model.f_street"
-                           style="width: 60%" placeholder="街道/乡镇" condition="f_street like '%{}%'">
+                  <div class="col-sm-3 form-group">
+                    <label class="font_normal_body">片区/行政村</label>
+                    <v-select :value.sync="model.f_community_id" v-model='model.f_community_id'
+                              :options='$parent.$parent.communitylist' placeholder='片区/管理站' filer-key="name"
+                              condition="ua.f_community_id = '{}'"
+                              @change="$parent.$parent.communityChange"
+                              close-on-select v-ref:slice>
+                    </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_residential_area"
-                           style="width: 60%" placeholder="小区名称" condition="f_residential_area like '%{}%'">
+                  <div  class="col-sm-3 form-group">
+                    <label class="font_normal_body">小区/自然村</label>
+                    <v-select :value.sync="model.f_residential_area_id" :value-single="true"
+                              :options='$parent.$parent.areaslist' placeholder='请选择'
+                              condition="ua.f_residential_area_id = '{}'"
+                              v-model='model.f_residential_area_id'
+                              close-on-select>
+                    </v-select>
                   </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">派发情况:</label>
@@ -381,7 +379,11 @@
         checkAll:false,
         checkes:[],
         excelUserCondtion:false,
-        uploadCodeCondition:''
+        uploadCodeCondition:'',
+        streetslist:[],
+        communitylist:[],
+        areaslist:[],
+        f_filialeids: this.$login.f.orgid,
       }
     },
     props:["selectplan","userlogin"],
@@ -394,8 +396,182 @@
       this.setConList()
       this.loadpage()
       this.getCommunity()
+      this.initpcds(` f_orgid = '${this.userlogin.orgid}'`)
+      this.initstreets(` f_orgid = '${this.userlogin.orgid}' `)
+      this.initareas(` f_orgid = '${this.userlogin.orgid}'`)
     },
     methods: {
+      // 初始化省市区,添加街道
+      async initpcds (pconditon) {
+        this.pcdslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_pcd',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_pcd,
+            value: row.id,
+            data: row,
+            id: row.id
+          }
+        })
+        this.pcdslist = redata
+        console.log("xxxxxxxxxxxxxx")
+        console.log(this.pcdslist)
+        console.log("redataxxxxxxxx")
+      },
+      // 初始化街道 添加小区
+      async initstreets (pconditon) {
+        this.streetslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_street',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_street,
+            value: row.id,
+            data: row,
+            id: row.id
+          }
+        })
+        this.streetslist = redata
+        console.log("xxxxxxxxxxxxxx")
+        console.log(this.streetslist)
+        console.log("redataxxxxxxxx")
+      },
+      // 初始化小区添加小区
+      async initareas (pconditon) {
+        // if(this.usertype){
+        //   pconditon=pconditon+` and  f_special='1' `
+        // }
+        this.areaslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_area',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row) => {
+          redata.push({
+            label: row.f_residential_area,
+            value: row.id,
+            data: row,
+            id: row.id
+          })
+        })
+        this.areaslist = redata
+      },
+      //小区变化
+      areaChange(val){
+        console.log("小区变化",val)
+        // 选择小区后级联出省市区和街道
+        let selectArea // 选中的小区数据
+        for (let row of this.areaslist) {
+          if (val == row.value) {
+            selectArea = row.data
+            break
+          }
+        }
+        if (selectArea) {
+          this.model.f_street_id = selectArea.f_street_id
+          this.model.f_pcd_id = selectArea.f_pcd_id
+          this.model.f_community_id = selectArea.f_community_id
+          console.log( this.model.f_community_id)
+
+          this.initstreets(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_street_id}' `)
+          this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
+          if(selectArea.f_community_id){
+            this.initcommunity(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_community_id}' `)
+          }
+          // this.model.f_slice_area = selectArea.f_slice_area
+          // 拼接地址
+          this.model.f_address = `${selectArea.f_street}${selectArea.f_community}${selectArea.f_residential_area}`
+          console.log( this.model.f_community_id)
+        }
+        this.$nextTick(() => {
+          this.$resetValidation()
+        })
+      },
+      // 片区变化 f_area_code
+      async areasChange (val) {
+        console.log('街道变化', val)
+        if (this.streetslist[0]) {
+          var street = ''
+          this.streetslist.forEach((item) => {
+            if (item.id === val) {
+              street = item.label
+            }
+          })
+          // this.model.f_address = street
+        }
+        if (val) {
+          // 那就把[小区]重新组织一下
+          await this.initareas(` f_area_code ='${val}' `)
+          if (this.$refs.paged.$refs.criteria.model.f_residential_area_id) {
+            if (this.findbyid(this.areaslist, this.$refs.paged.$refs.criteria.model.f_residential_area_id)) {
+              let street_id = this.findbyid(this.areaslist,this.$refs.paged.$refs.criteria.model.f_residential_area_id).f_street_id
+              if (street_id != val) {
+                this.$refs.paged.$refs.criteria.model.f_residential_area_id = ''
+              }
+            } else {
+              this.$refs.paged.$refs.criteria.model.f_residential_area_id = ''
+            }
+          }
+        }
+      },
+      //街道变化
+      //初始化街道 添加小区
+      async initcommunity(pconditon){
+        this.communitylist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_community',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_community_name,
+            value: row.id,
+            data:row,
+            id:row.id
+          }
+        })
+        this.communitylist=redata
+      },
+      async streetChange(val){
+        if(val){
+          await this.initcommunity(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
+        }
+      },
+      async  communityChange(val){
+        console.log(val)
+        if(val){
+          await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
+        }
+      },
       getCommunity(){
         this.community=[]
         new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
@@ -518,19 +694,23 @@
           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})
-            })
+      select_search(){
+        this.areaList = []
+        new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+          data: {
+            items: 'id,f_check_book_name',
+            tablename: 't_check_book',
+            condition: `f_orgid = '${this.userlogin.orgid}'`,
+            orderitem: 'id desc'
           }
-          //tag)
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          this.areaList.push({label: '全部', value: ''})
+          res.data.forEach(ress => {
+            this.areaList.push({
+              label: ress.f_check_book_name,
+              value: ress.id
+            })
+          })
         })
       },
       //获取抄表册

package/src/filiale/hanzhong/pc/CheckSearchUser.vue

@@ -218,6 +218,18 @@
                         :options='$parent.$parent.entry_status'
               ></v-select>
             </div>
+            <div :class="$parent.$parent.style"  v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">计划类型</label>
+              <v-select class="select_list select"
+                        placeholder='请选择'
+                        :value.sync="model.f_safe_type" v-model="model.f_safe_type"
+                        :options='$parent.$parent.safe_types'
+                        filer-key="name"
+                        condition="f_safe_type = '{}'"
+                        close-on-select clear-button
+                        :value-single="true">
+              </v-select>
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -520,6 +532,7 @@ export default {
         f_defect_content: 'this.f_defect_content'
       }),
       entry_status:[{label: '入户', value: '入户'}, {label: '拒检', value: '拒检'}, {label: '到访不遇', value: '到访不遇'}],
+      safe_types:this.$appdata.getParam('计划类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('计划类型')]:[{label: '全部', value: ''}],
       f_defect_content:"CASE WHEN CHARINDEX( '\"result\":\"正常\"', tp.f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( tp.f_defect_content, len( tp.f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END",
       orgstrs: [{label: '全部', value: ''}],
       checkersid: [],

package/src/filiale/tongchuan/pc/checkUserList.vue

@@ -344,8 +344,8 @@
         },
         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_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()