safecheck-client 3.0.30-62 → 3.0.30-62-t4

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

@@ -27,11 +27,11 @@
                      placeholder="地址" condition="f_address like '%{}%'">
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
-              <export-excel-safe :data="$parent.$parent.searchData"
+              <export-excel :data="$parent.$parent.searchData"
                                  :field="$parent.$parent.excelHeaders"
                                  :choose-col="true"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
-                                 template-name='用户安检情况'></export-excel-safe>
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
+                                 template-name='用户安检情况'></export-excel>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -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">
@@ -233,10 +245,10 @@
                      placeholder="用户姓名" condition="f_user_name like '%{}%'">
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
-              <export-excel-safe :data="$parent.$parent.searchData"
+              <export-excel :data="$parent.$parent.searchData"
                                  :field="$parent.$parent.excelHeaders"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
-                                 template-name='用户安检情况'></export-excel-safe>
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
+                                 template-name='用户安检情况'></export-excel>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -514,12 +526,13 @@ export default {
         'f_createfile_date': '建档日期',
         'f_gas_date': '通气日期'
       },
-      model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
+      model: new PagedList('api/af-safecheck/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",
         timetype: "'dd'",
         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: [],
@@ -625,7 +638,7 @@ export default {
      searchInfo(val){
       this.dialogVisible = true
       //tag
-       new HttpResetClass().load('POST','rs/logic/QrcodeUtil', {
+       new HttpResetClass().load('POST','api/af-safecheck/logic/QrcodeUtil', {
         data: {
           id:val
         }
@@ -642,7 +655,7 @@ export default {
     //获取省市区列表
     getPcd(val){
       this.pcds = [{label:'全部',value:''}]
-      new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
+      new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
         {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid in ${val}`}},
         {resolveMsg: null, rejectMsg: null}).then((pcdlist)=>{
         pcdlist.data.forEach((result)=>{
@@ -681,7 +694,7 @@ export default {
       ////tag
       ////tag
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
             items: 'name',
             tablename: 't_zone',
             condition: `parentid  in ${val}`,
@@ -989,7 +1002,7 @@ export default {
       ////tag
       this.cbcs=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
             items: 'f_book_name,f_book_slice_area,id',
             tablename: 't_meter_book',
             condition: `f_filiale_id  in ${val}`,

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

@@ -221,7 +221,7 @@
                       :show-rest-button="reset"
                       :value.sync="model.f_start_time"
                       v-model="model.f_start_time"
-                      condition="ui.f_last_check_date >='{} 00:00:00'">
+
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
@@ -234,7 +234,7 @@
                       :show-rest-button="reset"
                       :value.sync="model.f_end_time"
                       v-model="model.f_end_time"
-                      condition="ui.f_last_check_date  <='{} 23:59:59'">
+
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4">
@@ -246,7 +246,6 @@
                       v-model="model.f_last_check_state"
                       :options='$parent.$parent.entry_status'
                       placeholder='请选择'
-                      condition="ui.f_last_check_state  = '{}'"
                       :search="false"
                       close-on-select
                       value-single
@@ -334,11 +333,11 @@
             <!--<div class="form-group col-sm-4 button-range" >
 
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel-safe   :data="$parent.$parent.exportParameter"
+              <export-excel   :data="$parent.$parent.exportParameter"
                                    :field="$parent.$parent.excelHeaders"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
                                    template-name='安检计划明细' :choose-col="true">
-              </export-excel-safe>
+              </export-excel>
 
             </div>-->
           </div>
@@ -391,7 +390,7 @@
     title: '计划管理',
     data() {
       return {
-        model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
+        model:new PagedList('/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
           "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
           "f_usertype": "''",
           "month": "''",
@@ -450,7 +449,7 @@
     methods: {
       getCheckBook(){
         this.checkBooks=[]
-        new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: 'id,f_check_book_name,f_check_book_type',
             tablename: 't_check_book',
@@ -485,13 +484,7 @@
         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,'未入户')!='入户')`
-        }*/
         if(args.model.checkBook){
           let arr=args.model.checkBook.split('-')
           if(arr[1] == '用户'){
@@ -500,8 +493,34 @@
             args.condition +=` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
           }
         }
-        if (args.model.f_last_check_state == '未检'){
-          args.condition = args.condition.replace("ui.f_last_check_state  = '未检'"," ui.f_last_check_state is null or ui.f_last_check_date is null ")
+        // if (args.model.f_last_check_state == '未检'){
+        //   args.condition += ` and ui.f_last_check_date <='${args.model.f_start_time}' or ui.f_last_check_date  >='${args.model.f_start_time}' and ( ui.f_last_check_date is null or ui.f_last_check_state is null or ui.f_last_check_date ='' ) `
+        // }else if(args.model.f_last_check_state == '') {
+        //   args.model.f_start_time ==''?
+        //   args.condition +=`  and ui.f_last_check_date >='${args.model.f_start_time}' and ui.f_last_check_date  <='${args.model.f_start_time}' `
+        // }else {
+        //   args.condition +=` and ui.f_last_check_state = ${args.model.f_last_check_state?args.model.f_last_check_state:''} and ui.f_last_check_date >='${args.model.f_start_time}' and ui.f_last_check_date  <='${args.model.f_start_time}' `
+        // }
+        if (!Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_start_time) || !Util.isEmpty(args.model.f_end_time) )){
+          if (args.model.f_last_check_state == '未检'){
+            var lscon = args.model.f_start_time ? ` or ui.f_last_check_date <= '${args.model.f_start_time} 00:00:00'` :''
+            lscon += lscon ? (args.model.f_end_time ? ` or ui.f_last_check_date >= '${args.model.f_end_time} 23:59:59'` :''): (args.model.f_end_time ? `ui.f_last_check_date >= '${args.model.f_end_time} 23:59:59'` :'')
+            args.condition +=`and (ui.f_last_check_state is null or ui.f_last_check_state =''  ${lscon} ) `
+          }else  {
+            var lscon = args.model.f_start_time ? ` and ui.f_last_check_date >= '${args.model.f_start_time} 00:00:00'` :''
+            lscon += lscon ? (args.model.f_end_time ? ` and ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'') : (args.model.f_end_time ? ` ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'')
+            args.condition += `and ui.f_last_check_state = '${args.model.f_last_check_state}' ${lscon}`
+          }
+
+        }else if (Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_start_time) || !Util.isEmpty(args.model.f_end_time) )) {
+          var lscon = args.model.f_start_time ? ` and ui.f_last_check_date >= '${args.model.f_start_time} 00:00:00'` :''
+          lscon += lscon ? (args.model.f_end_time ? ` and ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'') : (args.model.f_end_time ? ` ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'')
+          args.condition += lscon
+        }else if (!Util.isEmpty(args.model.f_last_check_state) && Util.isEmpty(args.model.f_start_time) && Util.isEmpty(args.model.f_end_time)){
+          this.$showMessage("选择安检状态时，需要选择安检时间区间！")
+          return
+        }else{
+          console.log('这块无条件')
         }
         if(this.uploadCodeCondition){
           args.condition +=` and ${this.uploadCodeCondition}`
@@ -533,7 +552,7 @@
       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)=>{
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/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=[]
@@ -550,7 +569,7 @@
         this.cbc=[]
         this.sliceArea=[]
         let http = new HttpResetClass()
-        let getMeterReadingBooks = await http.load('POST','rs/logic/getMeterBooksData',
+        let getMeterReadingBooks = await http.load('POST','api/af-safecheck/logic/getMeterBooksData',
           {data: {f_orgid: "('"+this.userlogin.orgid+"')"}},
           {resolveMsg: null, rejectMsg: '获取失败！！！'})
         this.cbc = [{label: '全部', value: ''}]
@@ -638,7 +657,7 @@
         if(this.selectplan && this.selectplan.id){
           this.$parent.isSend=true
           try{
-            let res=await new HttpResetClass().load("POST", "/rs/logic/AddCheckPlanItem", {
+            let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/AddCheckPlanItem", {
               data:{
                 f_operator:this.userlogin.name,
                 f_plan_id:this.selectplan.id,
@@ -677,7 +696,7 @@
         let data = {
           filepath: res.f_downloadpath
         }
-        new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
+        new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_GetUserInfoFromExcel', {data: data}, {
           resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
           rejectMsg: '导入失败'
         }).then((res) => {