safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/src/components/rongcheng/CheckSearchUser.vue

@@ -7,46 +7,24 @@
       <criteria partial='criteria' v-show="$parent.criteriaShow" @condition-changed='$parent.search' v-ref:criteria>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body">用户编号</label>
-              <input type="text" class="input_search" v-model="model.f_userinfo_code" id="f_userinfo_code" style="width:60%;"
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label">用户编号</label>
+              <input type="text" class="form-control" v-model="model.f_userinfo_code" id="f_userinfo_code"
                      placeholder="用户编号" condition="f_userinfo_code like '%{}%'">
             </div>
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body">用户姓名</label>
-              <input type="text" class="input_search" v-model="model.f_user_name" id="f_user_name" style="width:60%;"
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label">用户姓名</label>
+              <input type="text" class="form-control" v-model="model.f_user_name" id="f_user_name"
                      placeholder="用户姓名" condition="f_user_name like '%{}%'">
             </div>
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body"> &nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
-<!--              <input type="text" class="input_search" v-model="model.f_residential_area" id="f_residential_area" style="width:60%;"
-                     placeholder="小区" condition="f_residential_area like '%{}%'">-->
-              <v-select
-                placeholder='小区选择'
-                :value-single="true"
-                v-model='model.f_residential_area'
-                :value.sync="model.f_residential_area"
-                class="select select_list"
-                :options='$parent.$parent.villagesChick'
-                condition="f_residential_area like '%{}%'"
-                close-on-select clear-button search valueSingle="true"> </v-select>
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label">小区</label>
+              <input type="text" class="form-control" v-model="model.f_residential_area" id="f_residential_area"
+                     placeholder="小区" condition="f_residential_area like '%{}%'">
             </div>
-
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body"> &nbsp;&nbsp;&nbsp;楼栋&nbsp;&nbsp;&nbsp;</label>
-              <v-select
-                placeholder='楼栋选择'
-                v-model='model.f_building'
-                :value.sync="model.f_building"
-                class="select select_list"
-                :options='$parent.$parent.buildingChick'
-                condition="f_building in {}"
-                clear-button search :multiple="true"> </v-select>
-            </div>
-
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body"> &nbsp;&nbsp;&nbsp;地址&nbsp;&nbsp;&nbsp;</label>
-              <input type="text" class="input_search" v-model="model.f_address" id="f_address" style="width:60%;"
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label">地址</label>
+              <input type="text" class="form-control" v-model="model.f_address" id="f_address"
                      placeholder="地址" condition="f_address like '%{}%'">
             </div>
             <!--<div class="col-sm-3 form-group form-input-group" style="width: 20%">-->
@@ -60,135 +38,88 @@
                         <!--condition="f_user_type = '{}'"-->
                         <!--close-on-select clear-button> </v-select>-->
             <!--</div>-->
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body" style="color: red;">安检筛选</label>
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label" style="color: red;">安检筛选</label>
               <v-select
                 placeholder='安检筛选'
                 :value-single="true"
-                class="select select_list"
                 :value.sync="$parent.$parent.SafeCheckXZ"
                 :options='$parent.$parent.SafeCheckXZs'
                 v-model="$parent.$parent.SafeCheckXZ"
                 close-on-select clear-button> </v-select>
             </div>
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body">安检起始</label>
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label">安检起始</label>
               <datepicker
                 :value.sync="model.f_check_start"
                 placeholder='最后安检时间起始'
                 :disabled-days-of-week="[]"
-                class="select select_list"
-                style="width: 60%"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
                 v-model = "model.f_check_start">
               </datepicker>
             </div>
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body">安检结束</label>
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label">安检结束</label>
               <datepicker
                 :value.sync="model.f_check_end"
                 placeholder='最后安检时间结束'
                 :disabled-days-of-week="[]"
-                class="select select_list"
-                style="width: 60%"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
                 v-model = "model.f_check_end">
               </datepicker>
             </div>
 
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body">安检状态</label>
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label">安检状态</label>
               <v-select id="f_entry"
                         placeholder='安检状态'
                         :value.sync="model.f_last_check_state"
                         :value-single="true"
-                        class="select select_list"
                         :options='$parent.$parent.checkstatus'
                         v-model="model.f_last_check_state"
                         condition="f_last_check_state = '{}'"
                         close-on-select clear-button> </v-select>
             </div>
-            <div  class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body">隐患情况</label>
+            <div  class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label">隐患情况</label>
               <v-select
                 placeholder='隐患情况'
                 :value-single="true"
                 v-model='model.f_check_result'
-                class="select select_list"
                 :value.sync="model.f_check_result"
                 :options='$parent.$parent.f_check_results'
                 condition="f_last_check_result  like '%{}%'"
                 close-on-select clear-button> </v-select>
             </div>
-            <!--<div  class="col-sm-4" style="width: 20%" v-if="$parent.$parent.orgstrs.length > 1">
-              <label class="font_normal_body">县域公司</label>
+            <div  class="col-sm-3 form-group form-input-group" style="width: 20%" v-if="$parent.$parent.orgstrs.length > 1">
+              <label class="control-label">县域公司</label>
               <v-select
                 placeholder='县域分公司'
                 :value-single="true"
                 v-model='model.f_orgstr'
                 :value.sync="model.f_orgstr"
-                class="select select_list"
                 :options='$parent.$parent.orgstrs'
                 condition="f_orgstr like '%{}%'"
                 close-on-select clear-button> </v-select>
-            </div>-->
-            <div  class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body">所属区域</label>
-              <v-select
-                placeholder='所属区域'
-                :value-single="true"
-                v-model='model.street'
-                :value.sync="model.street"
-                class="select select_list"
-                :options='$parent.$parent.streets'
-                condition="f_street ='{}'"
-                close-on-select clear-button> </v-select>
             </div>
             <div class="row">
-              <div class="col-sm-4" style="width: 20%">
-                <label class="font_normal_body">开户起始</label>
-                <datepicker
-                  :value.sync="model.f_createfile_start"
-                  placeholder='开户起始时间'
-                  :disabled-days-of-week="[]"
-                  class="select select_list"
-                  style="width: 60%"
-                  :format="'yyyy-MM-dd'"
-                  :show-rest-button="reset"
-                  condition="f_createfile_date > '{} 00:00:000'"
-                  v-model = "model.f_createfile_start">
-                </datepicker>
-              </div>
-              <div class="col-sm-4" style="width: 20%">
-                <label class="font_normal_body">开户结束</label>
-                <datepicker
-                  :value.sync="model.f_createfile_end"
-                  placeholder='开户结束时间'
-                  :disabled-days-of-week="[]"
-                  class="select select_list"
-                  style="width: 60%"
-                  :format="'yyyy-MM-dd'"
-                  condition="f_createfile_date < '{} 23:59:000'"
-                  :show-rest-button="reset"
-                  v-model = "model.f_createfile_end">
-                </datepicker>
-              </div>
               <div class="col-sm-8"></div>
-                <div style="float: right;margin-right: 10px">
-                <export-excel-safe   :data="$parent.$parent.searchData"
+              <div class="col-sm-2">
+              </div>
+              <div class="col-sm-1">
+                <div class="span" style = "float:left;">
+                <export-excel   :data="$parent.$parent.searchData"
                                 :field="$parent.$parent.excelHeaders"
-                                sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案" template-name='用户安检情况'></export-excel-safe>
-                  <div style="float: right" class="button_spacing"
-                       :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
-                       @click="$parent.$parent.hiddenr()"></div>
+                                sqlurl="api/af-safecheck/logic/exportfile" sql-name="FetchUserFileByOrgChecker" template-name='用户安检情况'></export-excel>
                 </div>
-                <div  class="span" style = "float:right;margin-right:10px">
-                  <button class="btn btn-primary width-80" @click="search()">查询</button>
+
               </div>
-              <div  class="span" style = "float:right;margin-right:10px">
-                <button class="btn btn-primary width-80" @click="$parent.$parent.show1()">年度安检率查看</button>
+              <div class="col-sm-1">
+                <div class="span" style = "float:left;">
+                  <button class="btn btn-primary width-80" @click="search()">查询</button>
+                </div>
               </div>
             </div>
           </div>
@@ -200,11 +131,10 @@
             <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>
-            <th><nobr>建档日期</nobr></th>
             <th><nobr>安检日期</nobr></th>
             <th><nobr>安检状态</nobr></th>
             <th><nobr>安检结果</nobr></th>
@@ -214,11 +144,10 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_userinfo_code}}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_user_name}}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_user_phone}}</td>
-          <!--<td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.count_item}}</td>-->
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.count_item}}</td>
           <td v-bind:class="{newcolor:row.code=='1'}" style="text-align: center">{{row.f_user_type}}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{row.f_residential_area}}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{row.f_address}}</td>
-          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{row.f_createfile_date}}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{row.f_last_check_date}}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{row.f_last_check_state}}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{$parent.$parent.$parent.getDefect(row.f_last_check_result)}}</td>
@@ -226,89 +155,6 @@
       </data-grid>
     </criteria-paged>
   </div>
-  <modal :show.sync="showModal" v-ref:modal backdrop="false">
-    <div slot="modal-header" class="modal-header">
-      <h4 class="modal-title">
-        年度安检率查看
-      </h4>
-    </div>
-    <div slot="modal-body" class="modal-body">
-      <div>
-        <form class="form-inline">
-          <div class="row form-group">
-              <div class="col-sm-4">
-                <label class="font_normal_body" >起始时间</label>
-                <datepicker
-                  :value.sync="y_check_start"
-                  placeholder='安检时间起始'
-                  :disabled-days-of-week="[]"
-                  class="select select_list"
-                  style="width: 60%"
-                  :format="'yyyy-MM-dd'"
-                  :show-rest-button="reset"
-                  v-model = "y_check_start">
-                </datepicker>
-              </div>
-              <div class="col-sm-4">
-                <label class="font_normal_body" >结束时间</label>
-                <datepicker
-                  :value.sync="y_check_end"
-                  placeholder='安检时间截止'
-                  :disabled-days-of-week="[]"
-                  class="select select_list"
-                  style="width: 60%"
-                  :format="'yyyy-MM-dd'"
-                  :show-rest-button="reset"
-                  v-model = "y_check_end">
-                </datepicker>
-              </div>
-            <button type="button" style="margin-left: 10px" class="button_search" @click="y_search()">查询</button>
-          </div>
-          <div class="row form-group">
-            <div class="col-sm-4">
-              <label class="font_normal_body">所属区域</label>
-              <v-select
-                placeholder='所属区域'
-                :value-single="true"
-                v-model='yearStreet'
-                :value.sync="yearStreet"
-                class="select select_list"
-                :options='streets'
-                close-on-select clear-button> </v-select>
-            </div>
-          </div>
-
-
-          <div style="width: 65%;height:100%; display: inline-block">
-          </div>
-
-        </form>
-        <hr>
-        <table class="table table_sy">
-          <thead>
-          <tr>
-            <th></th>
-            <th>总户数</th>
-            <th>安检入户数</th>
-            <th>一次安检率</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr v-for="row in yearmodel">
-            <td></td>
-            <td  style="text-align: center;">{{row.con}}</td>
-            <td  style="text-align: center;">{{row.rhcon}}</td>
-            <td  style="text-align: center;">{{row.f_check_bv}}</td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer" style="text-align: center">
-      <!--<button  class="button_search button_spacing" @click="ok()">确认</button>-->
-      <button  class="button_clear button_spacing" @click="cancel()">取消</button>
-    </div>
-  </modal>
 </template>
 
 <script>
@@ -344,8 +190,6 @@
         moptions.push({label: i + '', value: i + ''})
 
       return {
-        y_check_start:`${new Date().getFullYear()}-01-01`,
-        y_check_end:`${new Date().getFullYear()}-12-31`,
         searchData: {
           condition: '1=1',
           orderitem: "f_userinfo_code",
@@ -359,7 +203,7 @@
           'f_userinfo_code': '用户编号',
           'f_user_name': '用户名称',
           'f_user_phone': '用户电话',
-          //'count_item':'安检次数',
+          'count_item':'安检次数',
           'f_user_type': '用户类型',
           'f_residential_area': '小区名称',
           'f_address':'地址',
@@ -367,7 +211,7 @@
           'f_last_check_state': '安检状态',
           'f_last_check_result':'安检结果'
         },
-        model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {orderitem: "'f_userinfo_code'",timetype:"'dd'" ,f_filialeids:`'(${this.$login.f.orgid})'`}),
+        model: new PagedList('api/af-safecheck/sql/FetchUserFileByOrgChecker', 20, {orderitem: "'f_userinfo_code'",timetype:"'dd'" ,f_filialeids:`'(${this.$login.f.orgid})'`}),
         orgstrs:[{label: '全部', value: ''}],
         checkersid:[],
         SafeCheckXZ:'',
@@ -382,10 +226,9 @@
         criteriaShow: true,
         checkers: [],
         chosenOrg: {id: 0},
+        showModal: false,
         checkedAll: false,
         checkrows: [],
-        yearmodel:[],
-        streets:[],
         adjustables: [],
         f_plan_year: year + '',
         f_plan_month: moptions[new Date().getMonth()].value,
@@ -400,13 +243,7 @@
         userstates: this.userstates(),
         sqlname:'',
         f_check_results:  [{label: '全部', value: ''}, {label: '正常', value: '正常'},{label: '有隐患', value: '有隐患'}],
-        creatPlanWay:'',
-        showModal:false,
-        yearStreet:'',
-        villagesModel:'', //小区绑定值
-        villagesChick:[], //小区选择值
-        buildingModel:'', //地址绑定值
-        buildingChick:[]  //地址选择值
+        creatPlanWay:''
 
       }
     },
@@ -426,76 +263,8 @@
       this.model.f_filialeids = this.$login.f.f_orgids
       this.model.f_filiale = this.$login.f.f_fengongsi
       this.model.f_OrgStr = this.$login.f.orgpathstr
-      this.initstreets()
-
-      //小区初始化
-      this.initVillage()
-      this.$refs.paged.$refs.criteria.search();
     },
     methods: {
-      show1(){
-        this.showModal=true
-      },
-      y_search(){
-        let condition=''
-        if(!this.y_check_start || !this.y_check_end){
-            this.$showMessage("请选择开始和结束时间")
-        }
-        condition += `and f_onsite_time > '${this.y_check_start} 00:00:000' and f_onsite_time < '${this.y_check_end} 23:59:59'`
-        new HttpResetClass().load('POST', 'rs/sql/FetchYearCheckRatio', {
-          data: {
-            condition: condition,
-            usertype:'民用',
-            f_street:this.yearStreet
-          }
-        }, {resolveMsg: null, rejectMsg: '获取地址失败!'}).then((res)=>{
-          console.log('---'+JSON.stringify(res))
-          this.yearmodel=res.data
-        })
-      },
-      //初始化小区
-      async initVillage(){
-        this.villagesChick = []
-        let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/safe_singleTable_GroupBy', {
-          data: {
-            items: 'f_residential_area',
-            tablename: 't_area',
-            condition: '1 = 1',
-            groupitem: 'f_residential_area'
-          }
-        }, {resolveMsg: null, rejectMsg: '获取小区列表失败!'})
-        let redata = []
-        req.data.forEach((row, n) => {
-          redata.push({label: row.f_residential_area,value: row.f_residential_area,data:row})
-        })
-        redata.unshift({label: '全部', value: '', data: ''})
-        this.villagesChick=redata
-      },
-      //初始化街道 添加小区
-      async initstreets(){
-        this.streetslist = []
-        let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
-          data: {
-            items: '*',
-            tablename: 't_street',
-            orderitem: 'id',
-            condition: `f_orgid = '${this.$login.f.orgid}'`
-          }
-        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-        let redata = []
-        req.data.forEach((row, n) => {
-          redata.push({label: row.f_street,value: row.f_street,data:row,id:row.id})
-        })
-        this.streets=redata
-      },
-      hiddenr() {
-        this.$parent.showItem = !this.$parent.showItem
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
       // 获取县域分公司内容
       getfengongsi(){
         let val = {source: 'this.getParentByType($organization$).getSpecialResByType($organization$)', userid: `${this.$login.f.id}`}
@@ -539,16 +308,15 @@
           return
         }
         if(this.SafeCheckXZ == '未安检'){
-          args.condition += " and ( f_last_check_date > '"+ args.model.f_check_end + " 23:59:000' or  f_last_check_date < '"+ args.model.f_check_start + " 00:00:000' or f_last_check_date is null)"
+          args.condition += " and ( f_last_check_date >= '"+ args.model.f_check_end + "' or  f_last_check_date <= '"+ args.model.f_check_start + "' or f_last_check_date is null)"
         }else{
           if(args.model.f_check_start){
-            args.condition += " and f_last_check_date > '"+ args.model.f_check_start + " 00:00:000'"
+            args.condition += " and f_last_check_date >= '"+ args.model.f_check_start + "'"
           }
           if(args.model.f_check_end){
-            args.condition += " and f_last_check_date < '"+ args.model.f_check_end + " 23:59:000'"
+            args.condition += " and f_last_check_date <= '"+ args.model.f_check_end + "'"
           }
         }
-
         args.condition += " and f_filialeid =  '" + this.$login.f.orgid + "' and f_user_type='民用'"
         this.searchData.condition=args.condition
         return this.model.search( args.condition, args.model)
@@ -697,31 +465,6 @@
     },
 
     watch: {
-      'model.model.f_residential_area'(){
-        this.model.model.f_building = []
-        this.buildingChick = []
-          if (!this.model.model){
-            return
-          }
-          if (!this.model.model.f_residential_area){
-            return
-          }
-         let HttpReset = new HttpResetClass()
-          let redata = []
-          HttpReset.load('POST', '/rs/sql/safe_singleTable_GroupBy', {
-            data: {
-              items: "f_building",
-              tablename: "t_user_address",
-              condition: `f_filialeid = ${this.$login.f.orgid} and f_residential_area= '${this.model.model.f_residential_area}'`,
-              groupitem: "f_building  order by cast((case PATINDEX('%[^0-9]%', f_building) when 0 then f_building else 999 end) as int)"
-            }
-          }, {resolveMsg: null, rejectMsg: '获取楼栋列表失败!'}).then(res=>{
-            res.data.forEach((row, n) => {
-              redata.push({ label: row.f_building,value: row.f_building,data:row})
-            })
-            this.buildingChick = redata;
-          })
-      },
       'model.f_usertype'(val){
         if(val == '民用'){
           this.model.safeCycle = this.civil