safecheck-client 3.0.33-15 → 3.0.33-152

package/src/filiale/yongzhou/pc/safeStatisticsYear.vue

@@ -1,12 +1,28 @@
 <template>
   <div id='app' class="basic-main" style="height: 100%">
     <criteria-paged :model="model" :pager='false'>
-      <criteria partial='criteria' @condition-changed='search' class="search_area">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' class="search_area">
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="col-sm-2 form-group">
-              <label for="startDate" class="font_normal_body">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期"
+            <div class="form-group col-sm-4"  >
+              <label class="font_normal_body">小&emsp;&emsp;区</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area"
+                     style="width: 60%" placeholder="小区" condition="tcpi.f_residential_area like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.user_types' placeholder='用户类型'
+                        close-on-select
+                        condition="tcpi.f_user_type = '{}'"></v-select>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-4 form-group">
+              <label for="startDate" class="font_normal_body">计划开始:</label>
+              <datepicker id="startDate" placeholder="计划开始"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
                           style="width: 60%;"
@@ -17,9 +33,9 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="col-sm-2 form-group">
-              <label for="endDate" class="font_normal_body">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期"
+            <div class="col-sm-4 form-group">
+              <label for="endDate" class="font_normal_body">计划结束:</label>
+              <datepicker id="endDate" placeholder="计划结束"
                           v-model="model.endDate"
                           :select-year="true"
                           :value.sync="model.endDate"
@@ -30,20 +46,6 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <div class="form-group col-sm-2"  >
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input type="text" class="input_search" v-model="model.f_residential_area"
-                     style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
-            </div>
-            <div class="form-group col-sm-2">
-              <label class="font_normal_body">用户类型</label>
-              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
-                        :value-single="true" style="width: 60%"
-                        class="select_list select"
-                        :options='$parent.$parent.user_types' placeholder='用户类型'
-                        close-on-select
-                        condition="tcpi.f_user_type = '{}'"></v-select>
-            </div>
             <div class="col-sm-4 form-group" style="margin-top: 8px">
               <button class="button_search button_spacing" @click="search()">查询</button>
               <report-print id='yearPrint' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
@@ -62,8 +64,8 @@
           </tr>
           <tr>
             <th colspan='12' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}
+              计划开始日期：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              计划结束日期：{{ model.model.endDate }}
             </th>
           </tr>
           </thead>
@@ -99,6 +101,28 @@
       getRes (obj) {
         this.model.f_filialeid = this.$login.convertToIn(obj.resids)
       },
+      selfSearch (args) {
+        let condition = {
+          condition1 : args.condition,
+          condition2 : `1=1 and f_entry_status = '入户'`
+        }
+        if (args.model.f_checker_id){
+          condition.condition2 += ` and f_checker_name = '${args.model.f_checker_id}'`
+        }
+        if (args.model.f_user_type){
+          condition.condition2 += ` and f_check_type = '${args.model.f_user_type}'`
+        }
+        if (args.model.f_residential_area){
+          condition.condition2 += ` and f_residential_area = '${args.model.f_residential_area}'`
+        }
+        if (args.model.checkstart){
+          condition.condition2 += ` and f_offsite_time >= '${args.model.checkstart}'`
+        }
+        if (args.model.checkend){
+          condition.condition2 += ` and f_offsite_time <= '${args.model.checkend}'`
+        }
+        this.model.search(condition, args.model)
+      }
     },
     ready () {
     },

package/src/filiale/yongzhou/pc/safeTable.vue

@@ -8,16 +8,16 @@
         小区隐患明细表
       </button>
       <button class="button_spacing button_search" @click="showaudio(3)" :class="{color:searchs.search3}">
-        隐患类型明细表工商
+        工商情况明细表
       </button>
       <button class="button_spacing button_search" @click="showaudio(4)" :class="{color:searchs.search4}">
         隐患类型明细表民用
       </button>
       <button class="button_spacing button_search" @click="showaudio(5)" :class="{color:searchs.search5}">
-        安检员明细(有计划)
+        安检员明细
       </button>
       <button class="button_spacing button_search" @click="showaudio(9)" :class="{color:searchs.search9}">
-        安检员明细(无计划)
+        安检员考核
       </button>
       <button class="button_spacing button_search" @click="showaudio(6)" :class="{color:searchs.search6}">
         安检日报表

package/src/filiale/yongzhou/pc.js

@@ -4,11 +4,15 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   "plan-manage":(resolve) => { require(['./pc/PlanManage'], resolve) },
+  "paper-defect-main":(resolve) => { require(['./pc/PaperDefectMain'], resolve) },
   "role-selector-safe":(resolve) => { require(['./pc/RoleSelector'], resolve) },
+  "select-check-plan":(resolve) => { require(['./pc/SelectCheckPlan.vue'], resolve) },
+  "check-plan":(resolve) => { require(['./pc/CheckPlan.vue'], resolve) },
   "check-user-list":(resolve) => { require(['./pc/checkUserList'], resolve) },
   'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
   "safe-table":(resolve) => { require(['./pc/safeTable'], resolve) },
   "safe-detail":(resolve) => { require(['./pc/safeDetail'], resolve) },
+  "safe-defect-paper-new":(resolve) => { require(['./pc/DefectPaperNew.vue'], resolve) },
   'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
   "community-detail":(resolve) => { require(['./pc/communityDetail'], resolve) },
   "community-type-detail-g":(resolve) => { require(['./pc/communityTypeDetailG'], resolve) },

package/src/filiale/zhongsheng/android/CurrentCreate.vue

@@ -809,8 +809,13 @@
           condition += " and ti.f_address like '%"+this.$refs.paged.$refs.cri.model.f_keyword+"%'"
         if(this.$refs.paged.$refs.cri.model.f_user_name)
           condition += " and ti.f_user_name like '%"+this.$refs.paged.$refs.cri.model.f_user_name+"%'"
-        if(this.$refs.paged.$refs.cri.model.f_state[0])
+        if(this.$refs.paged.$refs.cri.model.f_state[0] == '未检' ){
+          condition += " and (ti.f_state='"+this.$refs.paged.$refs.cri.model.f_state[0]+"' or ti.f_last_check_state = '到访不遇' ) "
+        }
+        if(this.$refs.paged.$refs.cri.model.f_state[0] == '已检' ){
           condition += " and ti.f_state='"+this.$refs.paged.$refs.cri.model.f_state[0]+"'"
+        }
+
         // if(this.$refs.paged.$refs.cri.model.f_last_state[0])
         //   condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_state[0]+"'"
         if(this.$refs.paged.$refs.cri.model.f_user_type[0])
@@ -823,7 +828,7 @@
           condition += " and ti.f_enter_number like '%"+this.$refs.paged.$refs.cri.model.f_enter_number+"%'"
 
         //tag
-        this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检')) and ti.f_no_checkplan = '有计划安检'" + condition)
+        this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or ti.f_last_check_state = '到访不遇') and ti.f_no_checkplan = '有计划安检'" + condition)
       },
       getNewOrder(){
         HostApp.__this__ = this

package/src/filiale/zhongsheng/pc/DefectPaperWeiXiu.vue

@@ -37,7 +37,6 @@
                 v-model='model.f_repaired'
                 :value.sync="model.f_repaired"
                 :options='$parent.$parent.repaired'
-                condition="f_repaired  = '{}'"
                 close-on-select clear-button> </v-select>
             </div>
             <div class=" col-sm-4 form-group button-range"  >
@@ -179,7 +178,6 @@
                 v-model='model.f_repaired'
                 :value.sync="model.f_repaired"
                 :options='$parent.$parent.repaired'
-                condition="f_repaired  = '{}'"
                 close-on-select clear-button> </v-select>
             </div>
 
@@ -457,6 +455,12 @@
         if (this.f_check_plan.f_plan_name) {
           args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
         }
+        if(args.model.f_repaired == '未修'){
+          args.condition += ` and f_defect_count != f_is_repaired `
+        }
+        if(args.model.f_repaired == '已处理'){
+          args.condition += ` and f_defect_count = f_is_repaired `
+        }
         this.model.search(args.condition, args.model)
       },
       getRes(obj) {

package/src/main.js

@@ -11,7 +11,7 @@ all()
 var Verificationfalg = false
 system(Verificationfalg)
 // system()
-safecheck('rongchuang')
+safecheck('siyang')
 // safecheck('rizhao')
 require('./bootstrap/less/bootstrap.less')
 require('./expandcss.less')

package/src/rongcheng.js

@@ -262,7 +262,9 @@ export default function () {
     require(['./components/rongcheng/report/CheckPlanUserList'], resolve)
   })
 
-
+  Vue.component('safecheck-file-upload', (resolve) => {
+    require(['./components/Util/SafecheckUpload'], resolve)
+  })
 
   //隐患报表
   Vue.component('hiddensituation', (resolve) => { require(['./components/report/HiddenSituation'], resolve) })

package/src/safecheck-android.js

@@ -273,6 +273,12 @@ export default function (filiale) {
   Vue.component('yuyue-add-planitem', (resolve) => { require(['./components/android/YuYueAddPlanItem'], resolve) })
 
 
+  Vue.component('reload-check-n', (resolve) => { require(['./components/safecheckNew/android/Recheck'], resolve) })
+  Vue.component('area-plan-n', (resolve) => { require(['./components/safecheckNew/android/AreaPlan'], resolve) })
+  Vue.component('add-plan-item-n', (resolve) => { require(['./components/safecheckNew/android/AddPlanItem'], resolve) })
+  Vue.component('current-create-n', (resolve) => { require(['./components/safecheckNew/android/CurrentCreate.vue'], resolve) })
+  Vue.component('safecheck-order-n', (resolve) => { require(['./components/safecheckNew/android/SafecheckOrderV.vue'], resolve) })
+  Vue.component('safecheck-devices-n', (resolve) => { require(['./components/safecheckNew/android/SafecheckDevices.vue'], resolve) })
   Vue.component('safecheck-order-temp', (resolve) => { require(['./components/android/SafecheckOrderVTemp'], resolve) })
   Vue.component('safecheck-devices-temp', (resolve) => { require(['./components/android/SafecheckDevicesTemp'], resolve) })
   Vue.component('paper-feedback-temp', (resolve) => { require(['./components/android/PaperFeedbackTemp'], resolve) })

package/src/safecheck.js

@@ -49,6 +49,9 @@ export default function (filiale) {
   Vue.component('paper-main', (resolve) => {
     require(['./components/paper/PaperList'], resolve)
   })
+  Vue.component('paper-main-n', (resolve) => {
+    require(['./components/safecheckNew/PaperList'], resolve)
+  })
   //资料修改审核
   Vue.component('UserInfoAudit', (resolve) => {
     require(['./components/userfile/UserInfoAudit'], resolve)