safecheck-client 3.0.33-1 → 3.0.33-11

package/src/filiale/yangchunboneng/android.js

@@ -1,20 +1,20 @@
-// 分公司特殊组件页面注册
-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) },
-}
-
-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) },
+}
+
+exports.specialComp = specialComp
+

package/src/filiale/yunchengminsheng/pc/checkUserList.vue

@@ -81,6 +81,21 @@
                     >
                     </v-select>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">表具状态:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_table_state"
+                      v-model="model.f_table_state"
+                      :options='$parent.$parent.tableStates'
+                      placeholder='请选择'
+                      condition="uf.f_table_state='{}'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">用气性质:</label>
                     <v-select
@@ -402,6 +417,7 @@
         showCondtion:false,
         userTypes:[],//用户类型
         userStates:[],//用户状态
+        tableStates:[],//表具状态
         gasproperties:[],//用气性质
         meter_classifys:[],//气表类型
         hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
@@ -520,7 +536,8 @@
           value: ''
         }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
 
-        this.userStates=this.$appdata.getParam('安检用户状态') ? [...this.$appdata.getParam('安检用户状态')] : []
+        this.userStates=this.$appdata.getParam('安检用户状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('安检用户状态')] : [{label: '全部', value: ''}]
+        this.tableStates=this.$appdata.getParam('安检表具状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('安检表具状态')] : [{label: '全部', value: ''}]
         this.gasproperties=this.$appdata.getParam('用气性质') ? [{
           label: '全部',
           value: ''

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('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 }
-})
+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(process.env.SAFE_CHECK);
+// 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 }
+})