safecheck-client 3.0.39-63 → 3.0.39-65

package/src/filiale/tongchuan/android/PhoneUpUserinfo.vue

@@ -167,12 +167,12 @@
       <div class="panel-body " v-show="headername=='表具信息'">
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">表&ensp;&ensp;&ensp;&ensp;号:</label>
-          <input type="text" :readonly="userinfo.meterinfo[0].f_meter_classify!='机表'" class="form-control rightipt"
+          <input type="text" readonly class="form-control rightipt"
                  style="width: 45%" v-model="userinfo.meterinfo[0].f_meternumber"/>
-          <button type="button"
-                  :disabled="!(userinfo.meterinfo[0].f_meter_classify=='机表' || userinfo.meterinfo[0].f_meter_classify=='金额卡表' || userinfo.meterinfo[0].f_meter_classify=='气量卡表')"
-                  name="button" class="btn btn-primary" style="width: 15%" @click="scan">扫码
-          </button>
+<!--          <button type="button"-->
+<!--                  :disabled="!(userinfo.meterinfo[0].f_meter_classify=='机表' || userinfo.meterinfo[0].f_meter_classify=='金额卡表' || userinfo.meterinfo[0].f_meter_classify=='气量卡表')"-->
+<!--                  name="button" class="btn btn-primary" style="width: 15%" @click="scan">扫码-->
+<!--          </button>-->
         </div>
 
         <!--<div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_meter_classify=='机表'">
@@ -213,7 +213,6 @@
                     v-model="userinfo.meterinfo[0].f_gasmodel_id"
                     placeholder='请选择'
                     :width='wid'
-                    readonly
                     :options="modellist"
                     close-on-select value-single></v-select>
         </div>
@@ -238,7 +237,6 @@
                     v-model="userinfo.meterinfo[0].f_adjustable_id"
                     placeholder='请选择'
                     :width='wid'
-                    readonly
                     :options="boxOptions"
                     close-on-select value-single></v-select>
         </div>
@@ -268,7 +266,6 @@
                     v-model="userinfo.meterinfo[0].f_position"
                     placeholder='请选择'
                     :width='wid'
-                    readonly
                     :options="wz_types"
                     close-on-select value-single></v-select>
         </div>
@@ -279,13 +276,12 @@
                     v-model="userinfo.meterinfo[0].f_aroundmeter"
                     placeholder='请选择'
                     :width='wid'
-                    readonly
                     :options="aroundmeters"
                     close-on-select value-single></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">气表类型:</label>
-          <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_classify" readonly/>
+          <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_classify" />
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">表前阀状态:</label>
@@ -294,7 +290,6 @@
                     v-model="userinfo.meterinfo[0].f_bqf_state"
                     placeholder='请选择'
                     :width='wid'
-                    readonly
                     :options="bqf_states"
                     close-on-select value-single></v-select>
         </div>
@@ -775,6 +770,7 @@
             this.userinfo_old.meterinfo[0].f_aroundmeter = this.userinfo.meterinfo[0].f_aroundmeter
             this.userinfo_old.meterinfo[0].f_bqf_state = this.userinfo.meterinfo[0].f_bqf_state
             this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
+            this.userinfo_old.meterinfo[0].f_meter_classify=this.userinfo.meterinfo[0].f_meter_classify
             userinfoms.userfiles = []
             this.userinfo_old.meterinfo[0].devicesinfo = this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])

package/src/main.js

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

package/src/safecheck-android.js

@@ -303,6 +303,7 @@ export default function (filiale) {
   // 铅封绑定
   Vue.component('seal-bind', (resolve) => { require(['./components/android/SealBind'], resolve) })
   Vue.component('stop-enabling', (resolve) => { require(['./components/android/Stopenabling'], resolve) })
+  Vue.component('reject-inspec-check', (resolve) => { require(['./components/android/rejectInspecCheck'], resolve) })
   //特殊目录给这里加
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/android`).specialComp