safecheck-client 3.0.33-84 → 3.0.33-85

package/src/filiale/yangchunboneng/android/SafecheckOrderV.vue

@@ -1973,6 +1973,7 @@ export default {
       // 用户信息
       this.$set('data.f_user_name', this.item.f_user_name)
       this.$set('data.f_rent_phone', this.item.f_rent_phone)
+      this.$set('data.f_zuhu_phone', this.item.f_zuhu_phone)
       this.$set('data.f_user_phone', this.item.f_user_phone)
       this.$set('data.f_userinfoid', this.item.f_userinfoid)
       this.$set('data.f_address', this.item.f_address)

package/src/filiale/yangchunboneng/android/SafecheckUserInfo.vue

@@ -32,6 +32,16 @@
                  v-model="userinfo.f_user_phone"/>
 
         </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>备用电话:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_rent_phone }}
+          </p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>租户电话:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_zuhu_phone }}
+          </p>
+        </div>
         <!--        <div class="col-xs-12" style="padding: 2px 0" v-if="updateuserphone&&(userinfo.planmeterss.f_aliasname=='机表')">-->
         <!--          <p class="panel-title text-left font" style="width: 23%;float: left"><b>机表表号:</b></p>-->
         <!--          <input class="panel-title text-left input-font" style="width: 53%" value="{{ userinfo.f_meter_no }}" v-model="userinfo.f_meter_no"/>-->

package/src/filiale/yangchunboneng/android.js

@@ -1,21 +1,21 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-// 手机特殊目录注册到该文件中
-let specialComp = {
-  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo.vue'], resolve) },
-  'paper-feedback': (resolve) => { require(['./android/PaperFeedback.vue'], resolve) },
-  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV.vue'], resolve) },
-  'DailyworkloadQuery': (resolve) => { require(['./android/DailyworkloadQuery.vue'], resolve) },
-  'current-create': (resolve) => { require(['./android/CurrentCreate.vue'], resolve) },
-  'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices.vue'], resolve) },
-  'andiroid-security-audit': (resolve) => { require(['./android/AndiroidSecurityAudit'], resolve) },
-  'add-plan-item': (resolve) => { require(['./android/AddPlanItem.vue'], resolve) },
-  'DailyworkloadQueryNew': (resolve) => { require(['./android/DailyworkloadQueryNew'], resolve) },
-  'new-check-paper-android': (resolve) => { require(['./android/NewCheckpaperAndroid'], resolve) },
-  'safe-history-look': (resolve) => { require(['./android/safeHistoryLook'], resolve) },
-  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
-}
-
-exports.specialComp = specialComp
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+// 手机特殊目录注册到该文件中
+let specialComp = {
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo.vue'], resolve) },
+  'paper-feedback': (resolve) => { require(['./android/PaperFeedback.vue'], resolve) },
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV.vue'], resolve) },
+  'DailyworkloadQuery': (resolve) => { require(['./android/DailyworkloadQuery.vue'], resolve) },
+  'current-create': (resolve) => { require(['./android/CurrentCreate.vue'], resolve) },
+  'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices.vue'], resolve) },
+  'andiroid-security-audit': (resolve) => { require(['./android/AndiroidSecurityAudit'], resolve) },
+  'add-plan-item': (resolve) => { require(['./android/AddPlanItem.vue'], resolve) },
+  'DailyworkloadQueryNew': (resolve) => { require(['./android/DailyworkloadQueryNew'], resolve) },
+  'new-check-paper-android': (resolve) => { require(['./android/NewCheckpaperAndroid'], resolve) },
+  'safe-history-look': (resolve) => { require(['./android/safeHistoryLook'], resolve) },
+  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
+}
+
+exports.specialComp = specialComp
+

package/src/filiale/yangchunboneng/pc/CheckBookSearchUser.vue

@@ -5,22 +5,17 @@
         <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-4">
                 <label class="font_normal_body">客户编号</label>
                 <input type="text" class="input_search" v-model="model.f_userinfo_code"
                        style="width: 60%" placeholder="客户编号" condition="f_userinfo_code='{}'">
               </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-4">
                 <label class="font_normal_body">客户名称</label>
                 <input type="text" class="input_search" v-model="model.f_user_name"
                        style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
               </div>
-              <div class="form-group col-sm-3" >
-                <label class="font_normal_body">地址</label>
-                <input type="text" class="input_search" v-model="model.f_address"
-                       style="width: 60%" placeholder="地址" condition="f_address like '%{}%'">
-              </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-4">
                 <button class="button_spacing button_search" @click="search()">查询</button>
                 <div style="float: right" class="button_spacing"
                      :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -28,17 +23,17 @@
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-4" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">地&emsp;&emsp;址</label>
+                <input type="text" class="input_search" v-model="model.f_address"
+                       style="width: 60%" placeholder="地址" condition="f_address like '%{}%'">
+              </div>
+              <div class="form-group col-sm-4" v-show="$parent.$parent.criteriaShow">
                 <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>
-              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">地址</label>
-                <input type="text" class="input_search" v-model="model.f_address"
-                       style="width: 60%" placeholder="地址" condition="f_address like '%{}%'">
-              </div>
-              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-4" v-show="$parent.$parent.criteriaShow">
                 <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%"
@@ -47,23 +42,20 @@
                           close-on-select
                           condition="f_user_type ='{}'"></v-select>
               </div>
-              <div class="col-sm-3 form-group" style="margin-bottom: 0px" v-show="$parent.$parent.criteriaShow">
+              <div class="col-sm-4 form-group" style="margin-bottom: 0px" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">公&emsp;&emsp;司</label>
                 <right-tree-safe  @re-res="$parent.$parent.getResm" v-model="model.f_orgid" condition="ui.f_orgid in {}"></right-tree-safe>
               </div>
-            </div>
-            <div class="row">
-              <div class="form-group col-sm-3"  v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">安检册名称</label>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">安&ensp;检&ensp;册</label>
                 <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
                           :value-single="true" style="width: 60%"
                           class="select_list select"
                           :options='$parent.$parent.checkBooks' placeholder='安检册名称'
                           close-on-select
                           condition="f_check_book_id ='{}'"></v-select>
-
               </div>
-              <div class="form-group col-sm-3"  v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">是否在册</label>
                 <v-select :value.sync="model.f_is_checkbook" v-model='model.f_is_checkbook'
                           :value-single="true" style="width: 60%"
@@ -74,6 +66,30 @@
                           condition="{}"></v-select>
               </div>
             </div>
+            <div class="row">
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">通气开始</label>
+                <datepicker
+                  :value.sync="model.f_gas_date_str"
+                  style="width: 60%"
+                  :format="'yyyy-MM-dd 00:00:00'"
+                  v-model="model.f_gas_date_str"
+                  condition="f_uservent_date > '{}'"
+                >
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">通气结束</label>
+                <datepicker
+                  :value.sync="model.f_gas_date_end"
+                  style="width: 60%"
+                  :format="'yyyy-MM-dd 23:59:59'"
+                  v-model="model.f_gas_date_end"
+                  condition="f_uservent_date < '{}'"
+                >
+                </datepicker>
+              </div>
+            </div>
           </div>
         </criteria>
         <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
@@ -582,16 +598,16 @@ export default {
     bus.$off('fresh-user')
   },
   ready () {
-    bus.$on('fresh-user',()=>{
-      console.log("进入方法")
-      this.bookAll = false
-      this.bookList = []
-      this.$refs.paged.$refs.criteria.search()
-    })
-    this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
-    //tag
-    // this.init=true
-    this.freshCheckBook()
+    // bus.$on('fresh-user',()=>{
+    //   console.log("进入方法")
+    //   this.bookAll = false
+    //   this.bookList = []
+    //   this.$refs.paged.$refs.criteria.search()
+    // })
+    // this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
+    // //tag
+    // // this.init=true
+    // this.freshCheckBook()
   }
 }
 </script>

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('yangchunboneng');
+// 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 }
+})