safecheck-client 3.0.35-3 → 3.0.35-30

package/src/components/querycheckpaper/PaperItem.vue

@@ -1,59 +1,59 @@
-<template>
-  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
-    <div class="auto">
-      <partial-view v-ref:pv>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户姓名:</label>
-          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户地址:</label>
-          <span class = "col-sm-8">{{rowdata.f_address}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">安检人:</label>
-          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
-          <label class = "col-sm-3 control-label">安检状态:</label>
-          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">入户时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">离开时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">用户评价:</label>
-          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
-        </div>
-      </partial-view>
-    </div>
-    <check-paper-items :row="rowdata"></check-paper-items>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import co from 'co'
-
-  export default {
-    title: '安检项信息',
-    name: 'CheckPaperItem',
-    props: ['row'],
-    data () {
-      return {
-        rowdata: this.row
-      }
-    },
-    ready () {
-      this.rowdata = this.row
-    },
-    watch: {
-      'row' (val) {
-        this.rowdata = val
-      }
-    }
-  }
-</script>
+<template>
+  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
+    <div class="auto">
+      <partial-view v-ref:pv>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户姓名:</label>
+          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户地址:</label>
+          <span class = "col-sm-8">{{rowdata.f_address}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">安检人:</label>
+          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
+          <label class = "col-sm-3 control-label">安检状态:</label>
+          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">入户时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">离开时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户评价:</label>
+          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
+        </div>
+      </partial-view>
+    </div>
+    <check-paper-items :row="rowdata"></check-paper-items>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import co from 'co'
+
+  export default {
+    title: '安检项信息',
+    name: 'CheckPaperItem',
+    props: ['row'],
+    data () {
+      return {
+        rowdata: this.row
+      }
+    },
+    ready () {
+      this.rowdata = this.row
+    },
+    watch: {
+      'row' (val) {
+        this.rowdata = val
+      }
+    }
+  }
+</script>

package/src/components/report/CheckPlanAreaList.vue

@@ -172,12 +172,21 @@
             <td style="text-align:center">{{row.f_buyu}}</td>
             <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
-            <!--<td style="text-align: center;">-->
-            <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
-            <!--</td>-->
           </tr>
         </template>
-        <template partial='foot'></template>
+        <template partial="foot">
+          <tr>
+            <td  style="text-align:center"><strong>合计：</strong></td>
+            <td  style="text-align:center" :colspan="$parent.$parent.$parent.nameForSql.length"></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total}}</strong></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_weijian}}</strong></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_yijian}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_ruhu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_buyu}}</strong></nobr></td>
+            <td  style="text-align:center"><nobr><strong>{{model.sums.f_jujian}}</strong></nobr></td>
+            <td  style="text-align:center"><strong>{{model.sums.f_plan_total>0?(model.sums.f_yijian/model.sums.f_plan_total*100).toFixed(2)+'%':0}}</strong></td>
+          </tr >
+        </template>
       </data-grid>
     </criteria-paged>
   </div>
@@ -194,7 +203,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
+        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
@@ -437,7 +446,18 @@
         }
         //tag
         this.model.rows=JSON.parse(JSON.stringify(temp))
+      },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1){
+        this.model.sums.f_plan_total = 0
+        this.model.sums.f_weijian = 0
+        this.model.sums.f_yijian = 0
+        this.model.sums.f_ruhu = 0
+        this.model.sums.f_buyu = 0
+        this.model.sums.f_jujian = 0
       }
+    }
     },
     computed:{
       exportParameter(){

package/src/components/rongcheng/AddPlanItem.vue

@@ -168,7 +168,7 @@
                 </div>
                 <div class="col-xs-12">
                   <p class="panel-title col-xs-5 text-left font"><b>隐患情况:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_last_check_result }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_defect_text }}</p>
                 </div>
               </div>
             </div>

package/src/components/rongcheng/AspiratedAreaPlan.vue

@@ -334,6 +334,7 @@
       </div>
       <div slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-default" @click="uploadPic">上传</button>
+        <button type="button" class="btn btn-default" @click="imgUpModalShow = false">取消</button>
       </div>
     </modal>
     <!--<back-page :need-back='true'  @flag="$back()"></back-page>-->

package/src/components/rongcheng/AspiratedPaperFeedbackm.vue

@@ -456,6 +456,10 @@
             let temp = getFile.data[i].f_downloadpath
             if (temp) {
               let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+              if (temp.startsWith('E:')){
+                URL = `rs/image/file/${getFile.data[i].f_filename}`
+              }
+              console.log(URL)
               getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
             }
           }

package/src/components/rongcheng/AspiratedUserInfo.vue

@@ -32,7 +32,7 @@
           <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_address }}</p>
         </div>
         <div class="col-xs-12" style="margin-left: 20px">
-          <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a></p>
+          <p class="panel-title col-xs-7 text-left input-font"><a @click="upuserinfo(userinfo.f_userinfoid)">设备信息维护</a></p>
         </div>
         <!--<div class="col-xs-12">
           <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
@@ -157,13 +157,21 @@
         })
         this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
       },
-      searchDevices(f_userinfo_id) {
+      // searchDevices(f_userinfo_id) {
+      //   this.$dispatch('gotoson', {
+      //     _this: this.$parent.$parent,
+      //     title: '设备查看',
+      //     safe: false
+      //   })
+      //   this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
+      // },
+      upuserinfo (f_userinfo_id) {
         this.$dispatch('gotoson', {
           _this: this.$parent.$parent,
-          title: '设备查看',
+          title: '档案信息变更',
           safe: false
         })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
+        this.$parent.$parent.$goto('PhoneUpUserinfo', {f_userinfo_id: f_userinfo_id, f_source: '安检'})
       },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())