safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/{rongcheng/AspPaperFeedback.vue → outsideSafecheck/android/safecheckWaitWork/PaperFeedbackTS.vue}

@@ -2,19 +2,21 @@
   <form novalidate class="form-horizontal" style="width: 95%;margin: auto">
     <div class="form-group col-sm-12 col-xs-12 col-md-12 info"  :class="style__">
       <div class="text-center">
-        <label class="font">总体送气照片请依次拍摄：</label>
+        <label class="font">总体安检照片请依次拍摄：</label>
       </div>
       <div class="col-md-12 col-sm-12 col-xs-12">
         <ol class="showIi">
-          <li>1.燃气设施全景</li>
-          <li>2.燃气表照片</li>
-          <li>3.灶具照片</li>
-          <li>4.其他照片</li>
+          <li style="color:red;">注意：请严格按照提示依据顺序拍摄相关图片</li>
+          <li>1、用户燃气本（用户名信息页）</li>
+          <li>2、燃气表底数</li>
+          <li>3、燃气表剩余</li>
+          <li>4、室内燃气管道全貌</li>
+          <li>5、所有用气设备</li>
         </ol>
       </div>
     </div>
     <div class="form-group col-sm-12"  :class="style__">
-      <label class="text-left font">总体送气照片</label>
+      <label class="text-left font">总体安检照片</label>
 
       <div class="auto" :class="style__">
         <div class="panel" style="padding: 10px 10px 5px 10px;">
@@ -22,7 +24,7 @@
             <div class="row" style="height: 240px;overflow: scroll;top: 1px" >
               <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px" v-for="(index,img) in paper.f_overall_imgs">
                 <img-self :src="img.f_overall_path" alt="总体安检照片" :width="140" :height="170"></img-self>
-                <img src="../../assets/删除.png" @click="delfile('f_overall_path', img.f_overall_path,index)" style="width: 15px;margin-top: -80px" alt="">
+                <img src="../../../../assets/删除.png" @click="delfile('f_overall_path', img.f_overall_path,index)" style="width: 15px;margin-top: -80px" alt="">
               </div>
             </div>
             <div class="row text-right div-photo">
@@ -36,25 +38,26 @@
     </div>
 
     <!--<div class="form-group col-sm-12">-->
-      <!--<label class="text-left font">总体安检照片2</label>-->
-      <!--<div class="auto">-->
-        <!--<div class="panel">-->
-          <!--<div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">-->
-            <!--<div class="row" style="height: 240px;overflow: scroll;top: 1px">-->
-              <!--<div class="col-sm-4">-->
-                <!--<img-self  :src="paper.f_overall2_path" alt="总体安检照片2" width="150" height="200"></img-self>-->
-              <!--</div>-->
-            <!--</div>-->
-            <!--<div class="row text-right div-photo">-->
-              <!--<button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_overall2_path', '总体安检照片2')">拍照</button>-->
-              <!--&nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../assets/remove.png" :class="style__"  @click="delfile('f_overall2_path', paper.f_overall2_path)" style="width: 25%;"></img>-->
-            <!--</div>-->
-          <!--</div>-->
-        <!--</div>-->
-      <!--</div>-->
+    <!--<label class="text-left font">总体安检照片2</label>-->
+    <!--<div class="auto">-->
+    <!--<div class="panel">-->
+    <!--<div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">-->
+    <!--<div class="row" style="height: 240px;overflow: scroll;top: 1px">-->
+    <!--<div class="col-sm-4">-->
+    <!--<img-self  :src="paper.f_overall2_path" alt="总体安检照片2" width="150" height="200"></img-self>-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--<div class="row text-right div-photo">-->
+    <!--<button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_overall2_path', '总体安检照片2')">拍照</button>-->
+    <!--&nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../assets/remove.png" :class="style__"  @click="delfile('f_overall2_path', paper.f_overall2_path)" style="width: 25%;"></img>-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--</div>-->
     <!--</div>-->
     <div class="form-group col-sm-12" :class="style__">
       <input type="checkbox" v-model="paper.f_read_instructions"/><label class="text-left font">我已阅读须知内容</label>
+
     </div>
     <div class="form-group col-sm-12" :class="style__">
       <label class="text-left font">用户签名</label>
@@ -73,68 +76,78 @@
         </div>
       </div>
     </div>
-    <div class="form-group col-sm-12">
-      <label>备注(非必填):</label><br/>
-      <textarea style="width: 100%; " v-model="paper.f_exceed_reason"></textarea>
+    <div class="form-group col-sm-12" :style="timeSet(this.isneedDate)?'':'display:none'">
+      <label>请输入超期原因:</label><br/>
+      <textarea style="width: 100%;" v-model="paper.f_exceed_reason"></textarea>
+    </div>
+    <div class="form-group col-sm-12" :class="style__">
+      <div class="col-xs-6 col-sm-6">
+        <input type="checkbox" v-model="backlistisselect" :readonly="enabled"/><label class="text-left font" >限制该用户购气</label>
+      </div>
+      <div class="col-xs-6 col-sm-6">
+        <input type="checkbox" v-model="deletebacklistisselect" :readonly="deleteenabled"/><label class="text-left font" >取消该用户购气</label>
+      </div>
     </div>
-    <!--<div class="form-group col-sm-12" :class="style__">
-      <input type="checkbox" v-model="backlistisselect" :readonly="enabled"/><label class="text-left font" >限制该用户购气</label>
-
-    </div>-->
     <div class="form-group col-md-12 col-sm-12 col-xs-12"  :class="style__">
-      <!--<div  class="form-group col-md-12 col-sm-12 col-xs-12">
-          <input type="checkbox" v-model="paper.f_defect_notified" class="showIi" />安检通知书/隐患整改通知书
-      </div>-->
-      <!--<div class="form-group col-md-12 col-sm-12 col-xs-12" v-if="paper.f_defect_notified">
+      <div  class="form-group col-md-12 col-sm-12 col-xs-12">
+        <input type="checkbox" v-model="paper.f_defect_notified" class="showIi" />隐患整改通知书
+      </div>
+      <div class="form-group col-md-12 col-sm-12 col-xs-12" v-if="paper.f_defect_notified">
         <div  class="form-group col-md-12 col-sm-12 col-xs-12">
           <button type="button" @click="print()">打印隐患整改单</button>
         </div>
         <div  class="form-group col-md-12 col-sm-12 col-xs-12">
-          <label class="text-left font">安检通知书/隐患整改通知书照片(要求能清晰反应安检通知单和用户签字内容)：</label>
+          <label class="text-left font">隐患整改通知书照片(要求能清晰反应安检通知单和用户签字内容)：</label>
           <div class="auto" >
             <div class="panel" style="padding: 10px 10px 5px 10px;">
               <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
                 <div class="row" style="height: 240px;overflow: scroll;top: 1px">
                   <div class="col-sm-4">
-                    <img-self  :src="paper.f_notified_path" alt="安检通知书/隐患整改通知书照片" width="150" height="200"></img-self>
+                    <img-self  :src="paper.f_notified_path" alt="隐患整改通知书照片" width="150" height="200"></img-self>
                   </div>
                 </div>
                 <div class="row text-right div-photo">
-                  <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_notified_path', '安检通知书/隐患整改通知书照片')">拍照</button>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_notified_path', this.paper.f_notified_path)" style="width: 25%;"></img>
+                  <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_notified_path', '隐患整改通知书照片')">拍照</button>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../../assets/remove.png" :class="style__" @click="delfile('f_notified_path', this.paper.f_notified_path)" style="width: 25%;"></img>
                 </div>
               </div>
-              </div>
             </div>
           </div>
-      </div>-->
+        </div>
+      </div>
       <div class="form-group col-md-12 col-sm-12 col-xs-12">
         <div class="row">
           <label class="text-left">请对我们的服务做出评价：</label>
         </div>
         <div class="col-xs-4 col-sm-4"  v-for="item in radios">
-            <input v-model="paper.f_client_evaluation" :value="item.label"  :checked='item.isChecked'  @click="check(item.value)" type="radio">{{item.label}}
+          <input v-model="paper.f_client_evaluation" :value="item.label"  :checked='item.isChecked'  @click="check(item.value)" type="radio">{{item.label}}
         </div>
 
         <!--<div class="col-sm-4">-->
-          <!--<radio-group :value.sync="paper.f_client_evaluation" type="success" buttons="false">-->
-            <!--<radio value="满意">满意</radio>-->
-            <!--<radio value="基本满意">基本满意</radio>-->
-            <!--<radio value="不满意">不满意</radio>-->
-          <!--</radio-group>-->
+        <!--<radio-group :value.sync="paper.f_client_evaluation" type="success" buttons="false">-->
+        <!--<radio value="满意">满意</radio>-->
+        <!--<radio value="基本满意">基本满意</radio>-->
+        <!--<radio value="不满意">不满意</radio>-->
+        <!--</radio-group>-->
         <!--</div>-->
       </div>
       <div class="form-group col-md-12 col-sm-12 col-xs-12">
-        <label class="text-left font">反馈录音:</label>
+        <label class="control-label font text-left col-md-4 col-xs-4">备注</label>
         <div class="col-md-12 col-sm-12 col-xs-12">
-          <button type="button" name="button" class="btn btn-primary btn-voice" @click="record">
-            <img src="../../assets/录音.png" style="width: 14%;">
-            <span v-if="!paper.f_recording1_path">开始录音</span>
-            <span v-if="paper.f_recording1_path">已录音</span>
-          </button>
-          &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" style="width: 15px;" :class="style__" @click="delAudioFile('f_recording1_path', paper.f_recording1_path)"></img>
+          <textarea  v-model="paper.f_repair_approved_note" class="form-control"></textarea>
         </div>
       </div>
+      <!--      <div class="form-group col-md-12 col-sm-12 col-xs-12">-->
+      <!--        <label class="text-left font">反馈录音:</label>-->
+      <!--        <div class="col-md-12 col-sm-12 col-xs-12">-->
+      <!--          <button type="button" name="button" class="btn btn-primary btn-voice" @click="record">-->
+      <!--            <img src="../../assets/录音.png" style="width: 14%;">-->
+      <!--            <span v-if="!paper.f_recording1_path">开始录音</span>-->
+      <!--            <span v-if="paper.f_recording1_path">已录音</span>-->
+      <!--          </button>-->
+      <!--          &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" style="width: 15px;" :class="style__" @click="delAudioFile('f_recording1_path', paper.f_recording1_path)"></img>-->
+      <!--        </div>-->
+      <!--      </div>-->
       <div v-if="false">
         <div class="text-center form-group col-md-12 col-sm-12 col-xs-12">
           <button  style="width: 30%;margin:3%;margin-bottom: 0%" type="button" v-show="$parent.$parent.actionEnabled && upload_state !='已传' &&(paper.f_complete != '已完成' || paper.back_f_entry_status != '入户') " class="btn save-btn" @click="$parent.$parent.save('temp')">临时保存</button>
@@ -145,8 +158,8 @@
           <button style="width: 30%;margin:3%;margin-bottom: 0%;margin-top: 0%" v-if="(safeCheckToRepair == true || safeCheckToRepair == 'true') && $parent.$parent.actionEnabled" class="btn repair-btn btn-warning " type="button" @click="showToRepair">转维修</button>        </div>
       </div>
 
-      </div>
-    </form>
+    </div>
+  </form>
   <modal :show.sync="showCheckToRepair" v-ref:modal :backdrop="isback">
     <div slot="modal-header" class="modal-header">
       <h4 class="modal-title">
@@ -200,7 +213,6 @@
           <div class="col-xs-8 col-md-8">
             <input type="text" v-model="$parent.$parent.model.f_remarks"/>
           </div>
-
         </div>
 
       </div>
@@ -221,9 +233,9 @@
       </h4>
     </div>
     <div slot="modal-body" class="modal-body">
-      <div class="row" style="margin-top: 6px">
-        <label style="color: red;">注:当前页面无法取消对用户的限制购气</label>
-      </div>
+<!--      <div class="row" style="margin-top: 6px">-->
+<!--        <label style="color: red;">注:当前页面无法取消对用户的限制购气</label>-->
+<!--      </div>-->
       <div class="row" style="margin-top: 6px">
           <textarea id="el_ca_tx" v-model.trim="cause" style="border-radius:4px;width: 100%;" placeholder="请输入限制用户购气原因" >
           </textarea>
@@ -234,11 +246,31 @@
       <button  type="button" name="button" class="col-sm-3 btn btn-primary" @click="cancel()">取消</button>
     </div>
   </modal>
+  <modal :show.sync="showmodelthree" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        取消限制用户购气
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <!--      <div class="row" style="margin-top: 6px">-->
+      <!--        <label style="color: red;">注:当前页面无法取消对用户的限制购气</label>-->
+      <!--      </div>-->
+      <div class="row" style="margin-top: 6px">
+          <textarea id="el_ca_txt" v-model.trim="deletecause" style="border-radius:4px;width: 100%;" placeholder="请输入取消限制用户购气原因" >
+          </textarea>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button  type="button" name="button" class="col-sm-3 btn btn-primary" @click="deletebacklist()">确认</button>
+      <button  type="button" name="button" class="col-sm-3 btn btn-primary" @click="deletecancel()">取消</button>
+    </div>
+  </modal>
 </template>
 
 <script>
   import Vue from 'vue'
-  import * as Util from '../Util'
+  import * as Util from '../../../Util'
   import { HttpResetClass } from 'vue-client'
   import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
   import Radio from 'vue-client/src/vue-strap/src/radioBtn'
@@ -304,7 +336,7 @@
   //               if(items.f_is_defect == true || items.f_is_defect == 'true'){
   //                 checkResult = '有隐患'
   //                 console.log('类型----',f_device_type)
-  //                 let res = yield self.$resetpost(`${self.Url}/rs/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
+  //                 let res = yield self.$resetpost(`${self.Url}/api/af-safecheck/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
   //                 console.log('获取安检设备信息结果=》'+JSON.stringify(res))
   //                 self.$set('detail.f_defect_id', res.data[0].id)
   //                 self.$set('detail.f_project',`${items.f_item_name}：${items.f_item_value}`)
@@ -341,7 +373,7 @@
   //         self.undo()
   //         self.$set('paper.f_SafeToRepair_id',res.data.f_service_id)
   //         console.log('更新维修单id')
-  //         self.$resetpost(`${self.Url}/rs/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
+  //         self.$resetpost(`${self.Url}/api/af-safecheck/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
   //           console.log('ret==>'+ret)
   //           if(ret.data.code ==200){
   //             console.log('维修单id修改成功')
@@ -373,14 +405,14 @@
       })
       self.f_repair_person = repairs
       if(self.$parent.$parent.role == 'inspect'){
-        let res = self.$androidUtil.bzLogic('getUserInfo',{id:self.paper.f_userinfoid})
+        let res = self.$androidUtil.bzLogic('getUserInfoTS',{id:self.paper.f_userinfoid})
         if(res.code == 200){
           self.$parent.$parent.user = res.data[0]
           self.$parent.$parent.model.f_area = self.$parent.$parent.user.f_area
         }
       }else{
         console.log('pc')
-        self.$resetpost(`${self.Url}/rs/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
+        self.$resetpost(`${self.Url}/api/af-safecheck/sql/safeCheckgetUserInfoTS`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
           console.log('res',res)
           if(res.data.length != 0){
             self.$parent.$parent.user = res.data[0]
@@ -399,6 +431,7 @@
     data() {
       return {
         images:[],
+        detailAddress:{},
         isneedDate:this.$parent.$parent.isneedDate,
         plan:this.$parent.$parent.item,
         meading:this.$parent.$parent.meading,
@@ -407,7 +440,10 @@
         upload_state: this.$parent.$parent.item.f_upload_state,
         enabled:false,//控制限制购气是否可选
         showmodel:false,
+        showmodelthree:false,
+        deleteenabled: false,
         backlistisselect:false,
+        deletebacklistisselect: false,
         radios:[
           {
             label: '满意',
@@ -427,7 +463,7 @@
         ],
         repairitems:[],
         repairstypes:this.$appdata.getParam('报修类型'),
-        f_repair_person: this.readRepair(),
+        f_repair_person: [],
         showrepair: false,
         safeCheckToRepair:'',
         showCheckToRepair:false,
@@ -465,7 +501,7 @@
       },
       // async isoverDate(){
       //   console.log("进入了这个方法")
-      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
       //       condition:"f_plan_item_id='"+this.$parent.$parent.item.id+"'"
       //     }
       //   })
@@ -507,6 +543,7 @@
         let fileName
         if(prop == 'f_overall_path'){
           if (!this.paper.f_overall_imgs[index] || this.paper.f_overall_imgs[index].f_overall_path.includes("nopic.png")) {
+            console.log("this.prop----11")
             fileName = Util.guid() + '-' + prop + '.jpg'
           } else {
             fileName = Util.getFileName(this.paper.f_overall_imgs[index].f_overall_path)
@@ -518,7 +555,6 @@
             fileName = Util.getFileName(this.paper[prop])
           }
         }
-
         HostApp._open_a_page({
           type: 'boomerang',
           page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
@@ -526,7 +562,7 @@
             file: fileName,
             requestCode: 111,
             callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
-            watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
+            watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name+'\t'+this.detailAddress.data
           }
         })
       },
@@ -538,8 +574,8 @@
       record() {
         if (this.$parent.$parent.role != 'inspect') {
           if (this.paper.f_recording1_path != '') {
-          window.location = this.paper.f_recording1_path
-        }
+            window.location = this.paper.f_recording1_path
+          }
         } else {
           HostApp.__callback__ = this.amrCallBack
           HostApp.__this__ = this
@@ -677,7 +713,7 @@
         this.printContent.push({type: 3, text: '安检时间：' + this.getNowFormatDate(), fontsize: 2, isbold: false, align: 'left'})
         this.printContent.push({type: 3, text: '用户签字：', fontsize: 2, isbold: false, align: 'left'})
         this.printContent.push({type: 4, value: 4, unit: 'line'})
-     },
+      },
 
       getDefect() {
         let showmore = false
@@ -692,13 +728,13 @@
         let backData = this.$parent.$parent.getAllDefect()
         // 对隐患信息进行遍历
         let res = JSON.parse(backData.f_defect_content)
-          this.printContent.push({
-            type: 3,
-            text: '安检结果：' + res.result,
-            fontsize: 2,
-            isbold: false,
-            align: 'left'
-          })
+        this.printContent.push({
+          type: 3,
+          text: '安检结果：' + res.result,
+          fontsize: 2,
+          isbold: false,
+          align: 'left'
+        })
         this.printContent.push({type: 3, text: '*******************************', fontsize: 3, isbold: false, align: 'center'})
 
 
@@ -781,18 +817,18 @@
               if (device.startsWith("device")) {
                 for (let item in backData[device]) {
                   if (backData[device].length != 0 && backData[device][item].f_device_type == dev) {
-                  for (let i in backData[device][item].f_items) {
-                    if (backData[device][item].f_items[i].f_is_defect == true || backData[device][item].f_items[i].f_is_defect == 'true') {
-                      this.printContent.push({
-                        type: 3,
-                        text: backData[device][item].f_items[i].f_item_name + ' ' + backData[device][item].f_items[i].f_item_value,
-                        fontsize: 2,
-                        isbold: true,
-                        align: 'left'
-                      })
+                    for (let i in backData[device][item].f_items) {
+                      if (backData[device][item].f_items[i].f_is_defect == true || backData[device][item].f_items[i].f_is_defect == 'true') {
+                        this.printContent.push({
+                          type: 3,
+                          text: backData[device][item].f_items[i].f_item_name + ' ' + backData[device][item].f_items[i].f_item_value,
+                          fontsize: 2,
+                          isbold: true,
+                          align: 'left'
+                        })
+                      }
                     }
                   }
-                  }
                 }
               }
             }
@@ -915,15 +951,15 @@
         let codata = JSON.parse(JSON.stringify(this.paper))
         for(let device in this.paper){
           if(device.startsWith("device")){
-              for(let item in this.paper[device]) {
-                for(let i in this.paper[device][item].f_items){
-                  let items = this.paper[device][item].f_items[i]
-                  console.log('items',items)
-                  if(items.f_is_defect == true || items.f_is_defect == 'true'){
-                    checkResult = '有隐患'
-                  }
+            for(let item in this.paper[device]) {
+              for(let i in this.paper[device][item].f_items){
+                let items = this.paper[device][item].f_items[i]
+                console.log('items',items)
+                if(items.f_is_defect == true || items.f_is_defect == 'true'){
+                  checkResult = '有隐患'
                 }
               }
+            }
           }
         }
         return checkResult
@@ -972,6 +1008,59 @@
         this.$parent.$parent.model.f_repairtype = ''
         this.meading = '转站点'
       },
+      //取消拉黑
+      async deletebacklist() {
+        if (!this.deletecause) {
+          this.$showMessage("请填写取消拉黑原因！")
+          return
+        }
+        this.paper.f_blocking_cause = this.deletecause
+        ////tag)
+        let http = new HttpResetClass()
+        ////tag
+        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+          data: {
+            items: "version",
+            tablename: "t_userinfo",
+            condition: "f_userinfo_id=" + this.paper.f_userinfoid,
+            orderitem: "f_userinfo_id"
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        ////tag)
+        ////tag
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
+          data: {
+            "f_operat_type": "取消拉黑",
+            "f_state": "有效",
+            "f_user_name": this.paper.f_user_name,
+            "f_comments": this.paper.f_delete_cause,
+            "f_operator": Vue.user.name,
+            "f_operatorid": Vue.user.id,
+            "f_orgid": Vue.user.orgid,
+            "f_orgname": Vue.user.orgs,
+            "f_depid": Vue.user.depids,
+            "f_depname": Vue.user.deps,
+            "f_describe": `${Vue.user.name}对用户${this.paper.f_user_name}进行取消拉黑`,
+            "f_userinfo_id": {
+              "f_userinfo_id": this.paper.f_userinfoid,
+              "f_user_state": "正常",
+              "version": res1.data[0].version
+            },
+            "f_limit_times":"",
+            "f_limit_value":""
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+
+        ////tag)
+        if (res2.data.code == 200) {
+          this.showmodelthree = false
+          this.deleteenabled = true
+          this.paper.f_blacklist = "否"
+          this.$showMessage("取消该用户限制购气成功！")
+        } else {
+          this.$showMessage("网络异常，请稍后再试！")
+        }
+      },
       //拉黑
       async backlist(){
         if(!this.cause){
@@ -982,32 +1071,32 @@
         console.log("vue.user:-"+JSON.stringify(Vue.user))
         let http = new HttpResetClass()
         console.log("即将进行拉黑！")
-        let res1= await http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`,{
-            data:{
-              items:"version",
-              tablename:"t_userinfo",
-              condition:"f_userinfo_id="+this.paper.f_userinfoid,
-              orderitem:"f_userinfo_id"
-            }
-          },{resolveMsg:null, rejectMsg: null})
+        let res1= await http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`,{
+          data:{
+            items:"version",
+            tablename:"t_userinfo",
+            condition:"f_userinfo_id="+this.paper.f_userinfoid,
+            orderitem:"f_userinfo_id"
+          }
+        },{resolveMsg:null, rejectMsg: null})
         console.log("查询版本号---"+JSON.stringify(res1))
         console.log("打印参数---"+this.paper.f_user_name+"-"+this.paper.f_blocking_cause+"-"+Vue.user.name+"-"+ Vue.user.id+"-"+Vue.user.orgid+"-"+Vue.user.orgs+"-"+Vue.user.depids+"-"+Vue.user.deps+"-"+this.paper.f_userinfoid)
-        let res2= await http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
-                  data: {
-                    "f_operat_type": "拉黑",
-                    "f_state": "有效",
-                    "f_user_name": this.paper.f_user_name,
-                    "f_comments": this.paper.f_blocking_cause,
-                    "f_operator": Vue.user.name,
-                    "f_operatorid": Vue.user.id,
-                    "f_orgid": Vue.user.orgid,
-                    "f_orgname": Vue.user.orgs,
-                    "f_depid": Vue.user.depids,
-                    "f_depname": Vue.user.deps,
-                    "f_describe": `${Vue.user.name}对用户${this.paper.f_user_name}进行拉黑`,
-                    "f_userinfo_id": {"f_userinfo_id": this.paper.f_userinfoid, "f_user_state": "正常", "version": res1.data[0].version}
-                  }
-                }, {resolveMsg:null, rejectMsg: null})
+        let res2= await http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
+          data: {
+            "f_operat_type": "拉黑",
+            "f_state": "有效",
+            "f_user_name": this.paper.f_user_name,
+            "f_comments": this.paper.f_blocking_cause,
+            "f_operator": Vue.user.name,
+            "f_operatorid": Vue.user.id,
+            "f_orgid": Vue.user.orgid,
+            "f_orgname": Vue.user.orgs,
+            "f_depid": Vue.user.depids,
+            "f_depname": Vue.user.deps,
+            "f_describe": `${Vue.user.name}对用户${this.paper.f_user_name}进行拉黑`,
+            "f_userinfo_id": {"f_userinfo_id": this.paper.f_userinfoid, "f_user_state": "正常", "version": res1.data[0].version}
+          }
+        }, {resolveMsg:null, rejectMsg: null})
 
         console.log("拉黑结果---"+JSON.stringify(res2))
         if(res2.data.code==200){
@@ -1027,12 +1116,16 @@
         this.backlistisselect=false
         this.showmodel=false
       },
+      deletecancel() {
+        this.deletebacklistisselect = false
+        this.showmodelthree = false
+      },
       repiarmancg(val){
         if(val){
           console.log(val)
           this.$parent.$parent.model.serviceacitivity[0].f_reciever = val.name
           let http1 = new HttpResetClass()
-          http1.load('POST',`${this.Url}/rs/sql/tel_singleTable_OrderBy`, {data: {
+          http1.load('POST',`${this.Url}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
               items: 'f_user_telephone',
               tablename: 't_user',
               condition: `name  = '${val}'`,
@@ -1042,11 +1135,19 @@
           })
         }
       },
+      getDetailAddress(){
+        this.detailAddress=HostApp.getDetailAddress()
+        console.log("拿到了！！！！！！！"+JSON.stringify(this.detailAddress))
+        this.detailAddress.data=this.detailAddress.data!=null?this.detailAddress.data:''
+        console.log("拿到了！！！！！！！"+JSON.stringify(this.detailAddress))
+      }
     },
+
     async ready() {
+      this.getDetailAddress()
+      this.paper.f_read_instructions=true
       // await this.isoverDate()
       console.log(this.isneedDate)
-      console.log("拿到了！！！！！！！")
       console.log('查询到的已办的返回内容' + JSON.stringify(this.$parent.$parent.item.f_upload_state))
       if (this.$parent.$parent.role == 'repair') {
         this.$set('style__', 'divmask')
@@ -1062,7 +1163,7 @@
       }
 
       for (let item of this.radios){
-         if(this.paper.f_client_evaluation == item.label){
+        if(this.paper.f_client_evaluation == item.label){
           item.isChecked = true;
         }
       }
@@ -1099,9 +1200,16 @@
         console.log('meading发生变化===>'+val)
         this.$parent.$parent.meading = val
       },
-      'backlistisselect'(val){
-        if(val==true){
-          this.showmodel=true
+      'backlistisselect'(val) {
+        if (val == true) {
+          this.showmodel = true
+          this.deletebacklistisselect=false
+        }
+      },
+      'deletebacklistisselect'(val) {
+        if (val == true) {
+          this.showmodelthree = true
+          this.backlistisselect = false
         }
       }
     }