safecheck-client 3.0.33-16 → 3.0.33-160

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

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('fugou')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('wenxi');
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

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)