safecheck-client 3.0.33-13 → 3.0.33-132

package/src/components/rongcheng/AspiratedPaperFeedbackm.vue

@@ -31,6 +31,9 @@
                           <img-self :src="img.f_overall_path" alt="总体送气照片" :width="150" :height="200"></img-self>
                           <!--<img src="../../assets/remove.png" @click="delfile('f_overall_path', img.f_overall_path,index)" class="imgs" style="width: 30px;" alt="">-->
                         </div>
+                        <div class="img" v-for="row in fileInfoData">
+                          <img :src="row.f_downloadURL">
+                        </div>
                       </div>
                     </div>
                     <div class="row text-right div-photo">
@@ -362,6 +365,7 @@
     title: '用户反馈',
     data() {
       return {
+        fileInfoData:[],
         paper:this.$parent.data,
         printContent:[],
         radios:[
@@ -432,12 +436,34 @@
         Url:this.$androidUtil.getProxyUrl()
       }
     },
-    props: ['idx'],
+    props: ['idx','item'],
     components: {
       RadioGroup,
       Radio
     },
     methods: {
+      //获取pc上传的送气全景照片
+      getGaspic() {
+        let data = {
+          tablename: 't_files',
+          condition: `f_blobid = '${this.item.id}'  order by f_uploaddate desc `
+        }
+        let http = new HttpResetClass()
+        http.load('post', 'rs/sql/singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then(getFile=> {
+          for (var i = 0; i < getFile.data.length; i++) {
+            let temp = getFile.data[i].f_downloadpath
+            if (temp) {
+              let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+              getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
+            }
+          }
+          this.fileInfoData = []
+          this.fileInfoData = getFile.data
+        })
+      },
       check(index) {
         //tag
         // 先取消所有选中项
@@ -948,6 +974,7 @@
       }
       //tag
       //tag
+      this.getGaspic()
     },
     watch:{
       '$parent.isUpload'(val){

package/src/components/rongcheng/AspiratedPaperMessage.vue

@@ -38,7 +38,7 @@
         <devicesm> </devicesm>
       </div>
       <div style="width: 95%;height: 900px;margin-left: 20px;float: left;">
-        <asp-paper-feedbackm v-bind:paper="this.data" ></asp-paper-feedbackm>
+        <asp-paper-feedbackm v-bind:paper="this.data"  :item="item" ></asp-paper-feedbackm>
       </div>
     </div>
   </div>

package/src/components/rongcheng/DefectPaper.vue

@@ -407,7 +407,7 @@
         defectType:[],
         userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
         defectLeave:'',
-        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'},{label: '其他隐患'}],
+        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'},{label: '其他隐患',value:'其他隐患'}],
         thead: '',
         headData: ['入户状态','用户名','用户电话','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','一级隐患数','一级隐患','二级隐患数','二级隐患','三级隐患数','三级隐患','其他隐患','隐患内容'],
         bodyData: ['f_entry_status','f_user_name','f_user_phone','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_fist_count','f_fist_content','f_second_count','f_second_content','f_third_count','f_third_content','f_other_count','f_defect_content'],

package/src/components/rongcheng/PaperListNPSQ.vue

@@ -158,6 +158,7 @@
           <td style="text-align: center">{{row.f_checker_name}}</td>
           <td style="text-align: center">
             <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
+            <button class="button_spacing button_search-1"  @click="$parent.$parent.$parent.addpic(row)">添加照片</button>
             <!--<button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"
                     @click="$parent.$parent.$parent.print(row)">
               打印
@@ -168,6 +169,27 @@
     </criteria-paged>
     <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
   </div>
+    <modal :show.sync="pic" v-ref:modal backdrop="true">
+      <header slot="modal-header" class="modal-header">
+        上传照片22
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <safecheck-file-upload
+            :blodid="bolbid"
+            :isupload="true"
+            :isdelete="true"
+            :isusetype="true"
+            :isremark="true"
+            :takeimg="false"
+            isusetype="送气照片"
+          ></safecheck-file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='piclose'>关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -179,6 +201,7 @@
     import * as Util from '../Util'
     import getNowDate from "../../utils/getNowDate";
     import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+    import safecheckUpload   from "../Util/SafecheckUpload.vue";
 
     //获取json配置文件
     let asyncReady = async function (self) {
@@ -209,6 +232,9 @@
 
     export default {
         title: '非民用送气结果查看',
+        components: {
+            safecheckUpload
+        },
         data() {
             let model = new PagedList('rs/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
@@ -274,10 +300,18 @@
                 orderFields: {
                   f_offsite_time: 'no'
                 },
+              bolbid:null,
+              pic:false,
             }
         },
         methods: {
-
+          piclose(){
+            this.pic=false
+          },
+          addpic(row){
+            this.bolbid=row.id
+            this.pic=true
+          },
             change(row) {
                 //Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {

package/src/components/rongcheng/PaperListSQ.vue

@@ -163,6 +163,7 @@
           <td style="text-align: center">{{row.f_checker_name}}</td>
           <td style="text-align: center">
             <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
+            <button class="button_spacing button_search-1"  @click="$parent.$parent.$parent.addpic(row)">添加照片</button>
             <!--<button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"
                     @click="$parent.$parent.$parent.print(row)">
               打印
@@ -173,6 +174,26 @@
     </criteria-paged>
     <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
   </div>
+    <modal :show.sync="pic" v-ref:modal backdrop="true">
+      <header slot="modal-header" class="modal-header">
+        上传照片
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <safecheck-file-upload
+            :blodid="bolbid"
+            :isupload="true"
+            :isdelete="true"
+            :isusetype="true"
+            :isremark="true"
+            :takeimg="false"
+            ></safecheck-file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='piclose'>关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -184,6 +205,7 @@
     import * as Util from '../Util'
     import getNowDate from "../../utils/getNowDate";
     import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+    import safecheckUpload   from "../Util/SafecheckUpload.vue";
 
     //获取json配置文件
     let asyncReady = async function (self) {
@@ -214,6 +236,7 @@
 
     export default {
         title: '民用送气结果查看',
+        components: {safecheckUpload},
         data() {
             let model = new PagedList('rs/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
@@ -230,16 +253,6 @@
             model.f_no_checkplan = ''
             model.f_filialeid = this.$login.f.orgid
             model.f_check_type='民用'
-          // let searchData={
-          //     f_plan_id: this.model.f_checker_id==undefined?"":this.model.f_checker_id,
-          //     f_approved: this.model.f_approved,
-          //     f_entry_status: this.model.f_entry,
-          //     f_no_checkplan:this.model.f_no_checkplan[0],
-          //     f_filialeid: this.model.f_filialeid,
-          //     //orderitem: this.model.f_offsite_time,
-          //     //condition:this.model.condition
-          // }
-            // model.f_subcompany = this.$login.f.f_fengongsi
             return {
               searchData: {
                 condition:"1=1",
@@ -276,10 +289,18 @@
                 orderFields: {
                   f_offsite_time: 'no'
                 },
+              bolbid:null,
+              pic:false,
             }
         },
         methods: {
-
+          piclose(){
+            this.pic=false
+          },
+          addpic(row){
+            this.bolbid=row.id
+            this.pic=true
+          },
             change(row) {
                 //Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {