safecheck-client 4.0.1-6 → 4.0.1-60

package/src/filiale/meihekou/pc.js

@@ -4,7 +4,9 @@ import Vue from "vue";
 //手机特殊目录注册到该文件中
 let specialComp = {
   'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
+  'new-check-paper-new': (resolve) => { require(['./pc/NewCheckpaperNew'], resolve) },
   'new-check-paper-temp': (resolve) => { require(['./pc/NewCheckpaperTemp'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
 }
 exports.specialComp = specialComp
 

package/src/filiale/minsheng/android/SwitchValve.vue

@@ -469,7 +469,7 @@
           meternumberf: this.thisOneData.f_meternumber,  //表号
           contentData: {isOpen: msg=='开阀' ? 1 : 0},  // oper 为true 时为开阀   false 为关阀
         }
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/iot_saveInstruct`, {data: data}).then((row) => {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/iot_saveInstruct`, {data: data}).then((row) => {
           this.$showMessage(`${msg}指令发送成功，请等候2分钟进行查询`)
           //tag
           this.thisOneData = '';

package/src/filiale/qianneng/android/SwitchValve.vue

@@ -342,7 +342,7 @@ export default {
         meternumberf: this.thisOneData.f_meternumber,  //表号
         contentData: {isOpen: msg=='开阀' ? 1 : 0},  // oper 为true 时为开阀   false 为关阀
       }
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/iot_saveInstruct`, {data: data}).then((row) => {
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/iot_saveInstruct`, {data: data}).then((row) => {
         this.$showMessage(`${msg}指令发送成功，请等候2分钟进行查询`)
         //tag
         this.thisOneData = '';

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

@@ -257,6 +257,10 @@
           <label class="righttxt">气表类型:</label>
           <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_classify" readonly/>
         </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_xc_meter_style"/>
+        </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_position"  readonly/>-->
@@ -661,6 +665,7 @@ export default {
           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_meternumber = this.userinfo.meterinfo[0].f_meternumber
+          this.userinfo_old.meterinfo[0].f_xc_meter_style = this.userinfo.meterinfo[0].f_xc_meter_style
           userinfoms.userfiles = []
           this.userinfo_old.meterinfo[0].devicesinfo = this.model
           userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
@@ -743,6 +748,7 @@ export default {
           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_meternumber = this.userinfo.meterinfo[0].f_meternumber
+          this.userinfo_old.meterinfo[0].f_xc_meter_style = this.userinfo.meterinfo[0].f_xc_meter_style
           userinfoms.userfiles = []
           this.userinfo_old.meterinfo[0].devicesinfo = this.model
           userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])

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

@@ -339,6 +339,20 @@
                     >
                     </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_region_id"
+                      v-model="model.f_region_id"
+                      :options='$parent.$parent.region'
+                      placeholder='请选择'
+                      condition="ta.f_region_id in {}"
+                      :search="false"
+                      :multiple="true"
+                    >
+                    </v-select>
+                  </div>
                   <!--<div class="form-group col-sm-4" >
                     <label class="font_normal_body">入户情况:</label>
                     <v-select
@@ -458,6 +472,7 @@
         yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
         entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
         tablebox:[],
+        region:[],
         sliceArea:[],
         meterbooks:[],
         hasCheckBooks:'否',
@@ -481,8 +496,28 @@
       this.setConList()
       this.loadpage()
       this.getTablebox()
+      this.getRegion()
     },
     methods: {
+      getRegion(){
+        this.region=[]
+        new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+          data: {
+            items: '*',
+            tablename: 't_region',
+            condition: `f_orgid = '${this.userlogin.orgid}'`,
+            orderitem: 'id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          this.region.push({label: '全部', value: ''})
+          res.data.forEach(ress => {
+            this.region.push({
+              label: ress.f_name,
+              value:  Number(ress.id)
+            })
+          })
+        })
+      },
       //获取调压箱信息
       getTablebox(){
         this.tablebox=[]