safecheck-client 3.0.34-91 → 3.0.34-93

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.34-91",
+  "version": "3.0.34-93",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/android/examples/SafeListExamples.vue

@@ -98,8 +98,8 @@
         </div>
       </div>
       <div class="row" style="text-align: center;background-color: #ffffff;">
-        <label class="font text-left" style="padding: 15px;" @click="showView=0" :style="{'color':showView == 0?'#003fffcf':'#a8a4a4'}">安检记录</label>
-        <label class="font text-left" style="padding: 15px;" @click="showView=1" :style="{'color':showView == 1?'#003fffcf':'#a8a4a4'}">物联网表上报情况</label>
+        <label class="font text-left" style="padding: 15px;" @click="showView=0" :style="{'color':showView == 0?'#1890FF':'#a8a4a4'}">安检记录</label>
+        <label class="font text-left" style="padding: 15px;" @click="showView=1" :style="{'color':showView == 1?'#1890FF':'#a8a4a4'}">物联网表上报情况</label>
       </div>
       <div style="margin-top: 10px" v-if="showView === 0" class="panel panel-default well" v-for="(idx,row) in model">
         <div class="bg-info" @click="viewDetails(row)">
@@ -149,48 +149,48 @@
           </div>
         </div>
       </div>
-      <div style="margin-top: 10px" v-if="showView === 1" class="panel panel-default well" v-for="(idx,row) in model">
-        <div class="bg-info" @click="viewDetails(row)">
+      <div style="margin-top: 10px" v-if="showView === 1" class="panel panel-default well" v-for="(idx,row) in model2">
+        <div class="bg-info">
           <div class="row form-group">
             <div class="col-xs-12 col-sm-12 col-md-12">
               <div class="row app-row">
                 <div class="col-xs-3">
-                  <label class="font text-left lable">安检时间</label>
+                  <label class="font text-left lable">用气量</label>
                 </div>
                 <div class="col-xs-8" >
-                  <p>{{ row.f_offsite_time }}</p>
+                  <p>{{ row.f_oughtamount }}</p>
                 </div>
               </div>
               <div class="row app-row">
                 <div class="col-xs-3">
-                  <label class="font text-left lable">安检人员</label>
+                  <label class="font text-left lable">用气金额</label>
                 </div>
                 <div class="col-xs-8" >
-                  <p>{{ row.f_checker_name }}</p>
+                  <p>{{ row.f_oughtfee }}</p>
                 </div>
               </div>
               <div class="row app-row">
                 <div class="col-xs-3">
-                  <label class="font text-left lable">安检状态</label>
+                  <label class="font text-left lable">本期余额</label>
                 </div>
                 <div class="col-xs-8" >
-                  <p>{{ row.f_entry_status }}</p>
+                  <p>{{ row.f_curbalance }}</p>
                 </div>
               </div>
               <div class="row app-row">
                 <div class="col-xs-3">
-                  <label class="font text-left lable">安检结果</label>
+                  <label class="font text-left lable">上期余额</label>
                 </div>
                 <div class="col-xs-8" >
-                  <p>{{ row.f_defect_content.includes('正常') ? '正常' : '有隐患' }}</p>
+                  <p>{{ row.f_balance }}</p>
                 </div>
               </div>
               <div class="row app-row">
                 <div class="col-xs-3">
-                  <label class="font text-left lable">整改内容</label>
+                  <label class="font text-left lable">上报时间</label>
                 </div>
                 <div class="col-xs-8" >
-                  <p>{{ row.f_defect_text || '无' }}</p>
+                  <p>{{ row.f_operate_date }}</p>
                 </div>
               </div>
             </div>
@@ -210,6 +210,7 @@ export default {
     return {
       model: [],
       showView:0,
+      model2:[],
       f_safecheck_code: ''
     }
   },
@@ -229,29 +230,41 @@ export default {
         data: {
           items: "tcp.*,ui.f_user_state,uf.f_table_state,uf.f_meternumber,uf.f_gasproperties as uf_gasproperties,ts.f_price_name,tg.f_meter_brand,CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END as f_defect_text",
           tablename: 't_check_paper tcp left join t_qr_code tqr on tcp.f_userinfo_code = tqr.f_userinfo_id ' +
-            'left join t_userinfo ui on ui.f_userinfo_id = tcp.f_userinfoid ' +
-            'left join t_userfiles uf on ui.f_userinfo_id = uf.f_userinfo_id ' +
+            'left join t_userinfo ui on ui.f_userinfo_id = tcp.f_userinfoid and ui.f_user_state != \'无效\'' +
+            'left join t_userfiles uf on ui.f_userinfo_id = uf.f_userinfo_id and uf.f_table_state in (\'正常\',\'停用\')' +
             'left join t_stairprice ts on uf.f_price_id = ts.id ' +
             'left join t_gasbrand tg on tg.id = uf.f_gasbrand_id',
-          condition: `tqr.f_safecheck_code  = '62243501'`,
+          condition: `tqr.f_safecheck_code  = '${this.f_safecheck_code}'`,
           orderitem: 'tcp.f_offsite_time desc'
         }
       },{resolveMsg: null,rejectMsg: null}).then((res) => {
         this.model = res.data
       })
     },
+    getmodel2() {
+      let http = new HttpResetClass()
+      http.load('POST', `rs/sql/tel_singleTable_OrderBy`, {
+        data: {
+          items: "wh.*",
+          tablename: 't_qr_code tqr left join t_handplan wh on wh.f_userinfo_code = tqr.f_userinfo_id',
+          condition: `tqr.f_safecheck_code = '${this.f_safecheck_code}' and wh.id is not null and wh.f_operate_date >= DATEADD(MONTH, -1, GETDATE())`,
+          orderitem: 'wh.id desc'
+        }
+      },{resolveMsg: null,rejectMsg: null}).then((res) => {
+        this.model2 = res.data
+      })
+    },
   },
   ready() {
-    console.log(window.location.href)
     let url = window.location.href
     if (url.includes('id')){
       const urlObj = new URL(url);
       this.f_safecheck_code = urlObj.searchParams.get('id')
       this.getmodel()
+      this.getmodel2()
     }else {
-      console.log(window.location.href)
-      console.log('非法数据')
       this.getmodel()
+      this.getmodel2()
     }
   }
 }
@@ -274,7 +287,7 @@ export default {
 
 .work-badge{
   background-image: url('./410.png');
-
+  background-repeat: no-repeat;
 }
 
 .lable{

package/src/filiale/bayan/android/PaperFeedback.vue

@@ -186,6 +186,10 @@
         </div>
 
       </div>
+      <div class="form-group col-sm-12 col-xs-12 col-md-12 ">
+        <label class="text-left font">隐患整改通知单单号</label>
+        <input v-model="paper.f_repairorder_id" :value="paper.f_repairorder_id"   type="text">
+      </div>
       <div class="form-group col-sm-12 col-xs-12 col-md-12 ">
         <label class="text-left font">副操</label>
         <v-select

package/src/filiale/bayan/pc/NewCheckpaper.vue

@@ -97,19 +97,19 @@ div {
               <tr>
                 <td style="text-align: center;border: #E9E9E9 solid 1px">街 道:</td>
                 <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_street }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">楼 号:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_building }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 号:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_building }}</td>
               </tr>
               <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">单 元:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_unit }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">楼 层:</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_floor }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">单 元:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_unit }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 层:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_floor }}</td>
               </tr>
               <tr>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">门 牌 号 :</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_room }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px">用户性质:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">门 牌 号 :</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_room }}</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px" >用户性质:</td>
                 <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_userproperties }}</td>
               </tr>
               <tr>
@@ -163,24 +163,26 @@ div {
                 </td>
               </tr>
               <tr>
-                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
+                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患通知单单号:</td>
                 <td colspan="3"
                     style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
-             <span v-for="deviceCollect in deviceCollects">
+                  {{ paperdata.f_repairorder_id }}
+                </td>
+              </tr>
+              <tr>
+                <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
+                <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
+                  <span v-for="deviceCollect in deviceCollects">
                       <span class="li-font">
                         {{ deviceCollect.name }}:{{ deviceCollect.value }}&nbsp;&nbsp;&nbsp;
                       </span>
-                <br>
-             <span v-if="deviceCollect.value == '有隐患'">
-               <lable>
-                 隐患:
-               </lable>
-                <span v-for="val in deviceCollect.devices">
-    {{ val }}
-  </span><br>
-             </span>
-
-           </span>
+                      <br>
+                      <span v-if="deviceCollect.value == '有隐患'">
+                        <lable>隐患:</lable>
+                        <span v-for="val in deviceCollect.devices">{{ val }}</span>
+                        <br>
+                      </span>
+                  </span>
                 </td>
               </tr>
 
@@ -485,18 +487,18 @@ div {
                 <tr>
                   <td style="text-align: center;border: #E9E9E9 solid 1px">街 道:</td>
                   <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_street }}</td>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px">楼 号:</td>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_building }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 号:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_building }}</td>
                 </tr>
                 <tr>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px">单 元:</td>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_unit }}</td>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px">楼 层:</td>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_floor }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">单 元:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_unit }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">楼 层:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_floor }}</td>
                 </tr>
                 <tr>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px">门 牌 号 :</td>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_room }}</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">门 牌 号 :</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px" v-if="paperdata.f_check_type=='民用'">{{ paperdata.f_room }}</td>
                   <td style="text-align: center;border: #E9E9E9 solid 1px">用户性质:</td>
                   <td style="text-align: center;border: #E9E9E9 solid 1px">{{ paperdata.f_userproperties }}</td>
                 </tr>
@@ -557,27 +559,28 @@ div {
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患通知单单号:</td>
                   <td colspan="3"
                       style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
-             <span v-for="deviceCollect in deviceCollects">
+                    {{ paperdata.f_repairorder_id }}
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
+                  <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
+                    <span v-for="deviceCollect in deviceCollects">
                       <span class="li-font">
                         {{ deviceCollect.name }}:{{ deviceCollect.value }}&nbsp;&nbsp;&nbsp;
                       </span>
-                <br>
-             <span v-if="deviceCollect.value == '有隐患'">
-               <lable>
-                 隐患:
-               </lable>
-                <span v-for="val in deviceCollect.devices">
-    {{ val }}
-  </span><br>
-             </span>
-
-           </span>
+                      <br>
+                      <span v-if="deviceCollect.value == '有隐患'">
+                         <lable>隐患:</lable>
+                         <span v-for="val in deviceCollect.devices">{{ val }}</span>
+                         <br>
+                      </span>
+                    </span>
                   </td>
                 </tr>
-
                 </tbody>
               </table>
               <table class="table table-striped table-bordered" style="margin-top: 40px"
@@ -1338,7 +1341,8 @@ export default {
       if (this.deviceCollects.length > 0) {
         this.hasDevice = true
       }
-      this.ajresult = JSON.parse(this.data.f_defect_content).result
+      this.data.f_userproperties = this.item.f_gasproperties
+      this.ajresult = JSON.parse(this.item.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
       this.showimg5 = this.data.f_noanswer1_path
       this.showimg6 = this.data.f_noanswer2_path
@@ -1860,7 +1864,7 @@ export default {
     setTimeout(() => {
       this.loading = false;
     }, 10000)
-    // this.putDevices()
+    this.putDevices()
     this.showAudit()
     this.newConfig = this.$appdata.getSingleValue('配置中心获取文件') ? this.$appdata.getSingleValue('配置中心获取文件') : '否';
     if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {