safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/Util.js

@@ -107,6 +107,32 @@ export function toStandardTimeString() {
     + ' ' + (hour<10? '0'+ hour : hour) + ':' + (min<10? '0'+ min : min) + ':' + (sec<10? '0'+ sec : sec)
 }
 
+export function getPreMonth(date) {
+  var arr = date.split('-');
+  var year = arr[0]; //获取当前日期的年份
+  var month = arr[1]; //获取当前日期的月份
+  var day = arr[2]; //获取当前日期的日
+  var days = new Date(year, month, 0);
+  days = days.getDate(); //获取当前日期中月的天数
+  var year2 = year;
+  var month2 = parseInt(month) - 1;
+  if (month2 == 0) {
+    year2 = parseInt(year2) - 1;
+    month2 = 12;
+  }
+  var day2 = day;
+  var days2 = new Date(year2, month2, 0);
+  days2 = days2.getDate();
+  if (day2 > days2) {
+    day2 = days2;
+  }
+  if (month2 < 10) {
+    month2 = '0' + month2;
+  }
+  var t2 = year2 + '-' + month2 + '-' + day2;
+  return t2;
+}
+
 export function to3339TimeString() {
   let dt = new Date()
   let month = dt.getMonth()+1
@@ -125,6 +151,66 @@ export function parse3339String(strDate) {
   )
 }
 
+/**
+ * 判断前值是否为空，如果为龙返回后值，类似sqlserver 同名函数 isnull(v1,v2)
+ * @param check_expression
+ * @param replacement_value
+ * @returns {string|Array|*}
+ */
+export function isnull(check_expression,replacement_value) {
+  if (typeof check_expression == 'string') {
+    if (check_expression) {
+      return check_expression
+    } else {
+      return replacement_value
+    }
+  }else if (check_expression instanceof Array) {
+    if (check_expression.length ===0) {
+      return replacement_value
+    } else {
+      return check_expression
+    }
+  } else if (check_expression instanceof Object) {
+    if (check_expression == null || !check_expression || JSON.stringify(check_expression) === "{}") {
+      return replacement_value
+    }else {
+      return check_expression
+    }
+  } else {
+    if (check_expression) {
+      return check_expression
+    } else {
+      return replacement_value
+    }
+  }
+}
+
+/**
+ * 将时间类型，转为指定的（YYYY-mm-dd HH:MM:SS）str类型
+ * @param fmt
+ * @param date
+ * @returns {*}
+ */
+export function dateFormatToFmt(fmt, date) {
+  let ret;
+  const opt = {
+    "Y+": date.getFullYear().toString(),        // 年
+    "m+": (date.getMonth() + 1).toString(),     // 月
+    "d+": date.getDate().toString(),            // 日
+    "H+": date.getHours().toString(),           // 时
+    "M+": date.getMinutes().toString(),         // 分
+    "S+": date.getSeconds().toString()          // 秒
+    // 有其他格式化字符需求可以继续添加，必须转化成字符串
+  };
+  for (let k in opt) {
+    ret = new RegExp("(" + k + ")").exec(fmt);
+    if (ret) {
+      fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+    }
+  }
+  return fmt;
+}
+
 export function format3339TimeString(dt) {
   let month = dt.getMonth()+1
   let date = dt.getDate()

package/src/components/android/AddGas.vue

@@ -79,7 +79,7 @@ export default {
   },
   ready () {
     // 获取用户档案
-    this.$resetpost(Vue.dataUrl + 'rs/sql/singleTable', {
+    this.$resetpost(Vue.dataUrl + 'api/af-safecheck/sql/singleTable', {
       data: {
         tablename: 'T_USERFILES',
         condition: "f_userid = '" + this.bukadata.f_userid + "'"
@@ -88,7 +88,7 @@ export default {
       this.userinfo = Object.assign({}, this.userinfo, res.data[0])
     })
     // //  获取卡号
-    // this.$resetpost(Vue.dataUrl + 'rs/sql/singleTable', {
+    // this.$resetpost(Vue.dataUrl + 'api/af-safecheck/sql/singleTable', {
     //   data: {
     //     tablename: 'T_USERFILES',
     //     condition: "f_userid = '" + this.bukadata.f_userid + "'"

package/src/components/android/AddPlanItem.vue

@@ -80,61 +80,33 @@
                 <input style="width: 100%" class="search_input input-font" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
               </div>
             </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">表&nbsp;&nbsp;箱&nbsp;&nbsp;号：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input style="width: 100%" class="search_input input-font" v-model="model.f_metertitles" placeholder="请输入表箱号" condition="uf.f_metertitles='{}'">
-              </div>
-            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">抄&nbsp;&nbsp;表&nbsp;&nbsp;册：</label>
-              </div>
-              <div class="col-xs-8" >
-                <v-select class="input-font"
-                          placeholder='请选择抄表册'
-                          :value.sync="model.f_meter_book_num"
-                          v-model="model.f_meter_book_num"
-                          :options='$parent.$parent.cbc'
-                          condition="uf.f_meter_book_num='{}'"
-                          close-on-select clear-button></v-select>
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">安检情况</label>
+                <label class="font text-left">档案状态：</label>
               </div>
               <div class="col-xs-8" >
                 <v-select class="input-font"
-                          placeholder='请选择安检情况'
-                          :value.sync="model.f_ischeck"
-                          v-model="model.f_ischeck"
-                          :options='$parent.$parent.ischecks'
-                          condition="{}"
+                          placeholder='请选择档案状态'
+                          :value.sync="$parent.$parent.model.f_user_state"
+                          :options='$parent.$parent.f_user_states'
                           close-on-select clear-button></v-select>
               </div>
             </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">档案状态：</label>
+                <label class="font text-left">安检类型：</label>
               </div>
               <div class="col-xs-8" >
                 <v-select class="input-font"
-                          placeholder='请选择档案状态'
-                          :value.sync="$parent.$parent.model.f_user_state"
-                          :options='$parent.$parent.f_user_states'
+                          placeholder='请选择安检类型'
+                          :value.sync="$parent.$parent.model.f_check_type"
+                          :options='$parent.$parent.f_check_types'
                           close-on-select clear-button></v-select>
               </div>
             </div>
 
-
-
             <div class="row text-center" style="margin-top: 20px;">
               <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search">查询</button>
             </div>
@@ -193,140 +165,72 @@
 </template>
 
 <script>
-import {HttpResetClass, PagedList} from 'vue-client'
-import Vue from 'vue'
-import * as Util from '../Util'
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
 
-export default {
-  title: '安检员B',
-  data () {
-    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area"',f_check_type:'this.f_check_type[0]',
-      f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
-    model.f_sign = ['']
-    model.f_user_type = ''
-    model.f_user_state =['']
-    model.f_check_type =['']
-    model.myCycle = 0
-    model.fyCycle = 0
-    model.f_filialeid = Vue.user.orgid
-    //model.f_filialeid = 287
-    return {
-      model: model,
-      cbc:[],
-      showModal:false,
-      signs: [
-        {label:'请选择录入状态', value:''},
-        {label:'录入', value:'1'},
-        {label:'非录入', value:'0'},
-      ],
-      ischecks: [
-      ],
-      user_types: [
-        {label: '请选择用户类型', value: ''},
-        {label: '民用', value: '民用'},
-        {label: '非民用', value: '非民用'},
-      ],
-      f_user_states: [
-        {label:'请选择档案状态', value:''},
-        {label:'正常', value:'正常'},
-        {label:'点火', value:'点火'},
-      ],
-      f_check_types: [
-        {label:'请选择安检类型', value:''},
-        {label:'应检', value:'应检'},
-        {label:'超期', value:'超期'},
-      ],
-    }
-  },
-  ready () {
-    this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
-      console.log(JSON.stringify(res))
+  export default {
+    title: '安检员B',
+    data () {
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area"',f_check_type:'this.f_check_type[0]',
+        f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
+      model.f_sign = ['']
+      model.f_user_type = ''
+      model.f_user_state =['']
+      model.f_check_type =['']
+      model.myCycle = 0
+      model.fyCycle = 0
+      model.f_filialeid = Vue.user.orgid
+      return {
+        model: model,
+        showModal:false,
+        signs: [
+          {label:'请选择录入状态', value:''},
+          {label:'录入', value:'1'},
+          {label:'非录入', value:'0'},
+        ],
+        user_types: [
+          {label: '请选择用户类型', value: ''},
+          {label: '民用', value: '民用'},
+          {label: '非民用', value: '非民用'},
+        ],
+        f_user_states: [
+          {label:'请选择档案状态', value:''},
+          {label:'正常', value:'正常'},
+          {label:'点火', value:'点火'},
+        ],
+        f_check_types: [
+          {label:'请选择安检类型', value:''},
+          {label:'应检', value:'应检'},
+          {label:'超期', value:'超期'},
+        ],
+      }
+    },
+    ready () {
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
+        console.log(JSON.stringify(res))
       if(res.data.code == 200){
         this.model.myCycle = res.data.civil.value
         this.model.fyCycle = res.data.civilian.value
       }else{
-        //this.$showMessage(res.data.msg)
+        self.$showMessage(res.data.msg)
       }
-
     })
-    this.getCheckTime()
-    this.Mreadibook()
-  },
-  computed: {
-    reload(){
-      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
     },
-    selected () {
-      return this.$refs.paged.$refs.grid.selected
-    }
-  },
-  methods:{
-    getCheckTime(){
-      console.log("进入方法")
-      new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
-          items: 'f_circle,f_start_time',
-          tablename: 't_safe_circle',
-          condition: `f_filialeid  = '${Vue.user.orgid}'`,
-          orderitem: 'id'
-        }}).then(res=>{
-        console.log("res==>"+JSON.stringify(res.data))
-        let  nocheck=''
-        let  ischeck=''
-        if (res.data[0]){
-          if (res.data[0].f_circle=='1'){
-            nocheck=`(ua.f_last_check_date<'${res.data[0].f_start_time}' or ua.f_last_check_date is null)`
-            ischeck=`ua.f_last_check_date>'${res.data[0].f_start_time}'`
-
-          }else{
-            let addtime= (Util.toStandardTimeString().substring(0,4)-res.data[0].f_start_time.substring(0,4))%res.data[0].f_circle
-            console.log(addtime)
-            let time =(Util.toStandardTimeString().substring(0,4)-addtime)+'-01-01 00:00:00'
-            console.log(time)
-            nocheck=`(ua.f_last_check_date<'${time}' or ua.f_last_check_date is null)`
-            ischeck=`ua.f_last_check_date>'${time}'`
-          }
-          console.log(ischeck)
-          this.ischecks=[
-            {label: '全部', value: ''},
-            {label: '已检', value: ischeck },
-            {label: '未检', value: nocheck},
-          ]
-          console.log(this.ischecks)
-        }else{
-          this.$showMessage("未配置安检周期")
-        }
-
-      })
-      console.log("出方法")
+    computed: {
+      reload(){
+        this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+      },
+      selected () {
+        return this.$refs.paged.$refs.grid.selected
+      }
     },
-    inspect (info){
-      if(info.f_last_check_date){
-        this.$showMessage("该用户最后一次安检时间为 "+info.f_last_check_date+" 是否继续对该用户进行安检",['confirm', 'cancel']).then((butt)=>{
-          if(butt=="confirm"){
-            info.id = ''
-            info.f_state = '未检'
-            info.f_no_checkplan = '无计划安检'
-            console.log(info)
-            this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
-              console.log(JSON.stringify(response))
-              info['f_plan_meters'] = response.data
-              var pardate = {
-                _this:this,
-                tittle:'安检详情',
-                safe:true
-              }
-              this.$dispatch('gotoson',pardate)
-              this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', this.reload)
-
-            })
-          }
-        })
-      }else{
+    methods:{
+      inspect (info){
         info.id = ''
         info.f_state = '未检'
         info.f_no_checkplan = '无计划安检'
         console.log(info)
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
           console.log(JSON.stringify(response))
           info['f_plan_meters'] = response.data
           var pardate = {
@@ -334,79 +238,56 @@ export default {
             tittle:'安检详情',
             safe:true
           }
-          this.$dispatch('gotoson',pardate)
+           this.$dispatch('gotoson',pardate)
           this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', this.reload)
 
         })
       }
-    },
-    Mreadibook(){
-      this.cbc=[]
-      let http = new HttpResetClass()
-      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/getMeterBooksData`,
-        {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
-        {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
-        this.cbc = [{label: '全部', value: ''}]
-        console.log('22222222222222222222222222222222222222')
-        console.log(JSON.stringify(getMeterReadingBooks))
-        console.log('22222222222222222222222222222222222222')
-        getMeterReadingBooks.data.meterbooks.forEach((res) => {
-          this.cbc.push({label: res.f_book_name, value: res.id})
-          /*if(res.f_book_slice_area){
-            if(this.sliceArea.indexOf(res.f_book_slice_area)<0){
-              this.sliceArea.push(res.f_book_slice_area)
-            }
-          }*/
-        })
-      })
-
-
     }
   }
-}
 </script>
 <style>
-.app-row {
-  background-color: white;
-  padding: 10px 10px 0 10px;
-  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-}
-.search_input {
-  border: 0;
-  outline: none;
-}
-.font{
-  font: 15px PingFang-SC-Medium;
-  color: #666666;
-}
-.input-font{
-  font: 15px PingFang-SC-Medium;
-  color: #333333;
-}
-.btn-font{
-  font:600 16px PingFang-SC-Bold;
-  color: #499EDF;
-}
-.btn-color{
-  background-color: #FFFFFF;
-  border-radius: 10px ;
-  border: 1px solid #499EDF;
-}
-.app-text {
-  font-size: 12px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.yybtn-color{
-  border-radius: 4px ;
-  border: 1px solid #499EDF;
-}
-.qxbtn-color{
-  background-color: #FFFFFF;
-  border-radius: 4px ;
-  border: 1px solid #499EDF;
-}
+  .app-row {
+    background-color: white;
+    padding: 10px 10px 0 10px;
+    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+  }
+  .search_input {
+    border: 0;
+    outline: none;
+  }
+  .font{
+    font: 15px PingFang-SC-Medium;
+    color: #666666;
+  }
+  .input-font{
+    font: 15px PingFang-SC-Medium;
+    color: #333333;
+  }
+  .btn-font{
+    font:600 16px PingFang-SC-Bold;
+    color: #499EDF;
+  }
+  .btn-color{
+    background-color: #FFFFFF;
+    border-radius: 10px ;
+    border: 1px solid #499EDF;
+  }
+  .app-text {
+    font-size: 12px;
+  }
+  .panel-self{
+    border-radius: 10px;
+    border:1px solid #499EDF;
+    background-color: #F8F8F8;
+  }
+  .yybtn-color{
+    border-radius: 4px ;
+    border: 1px solid #499EDF;
+  }
+  .qxbtn-color{
+    background-color: #FFFFFF;
+    border-radius: 4px ;
+    border: 1px solid #499EDF;
+  }
 </style>

package/src/components/android/AdviseCommit.vue

@@ -43,7 +43,7 @@ export default {
   methods: {
     async commitAdvise(){
       let http=new HttpResetClass()
-      let res=await http.load('POST', '/rs/logic/addAdvise', {
+      let res=await http.load('POST', '/api/af-safecheck/logic/addAdvise', {
        data:{
          f_filialeid:"305",
          f_adviser_id:"111",

package/src/components/android/AndroidCheckResult.vue

@@ -160,7 +160,7 @@
     title: '移动端在线安检结果查询',
     data() {
       return {
-        model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/AndroidCheckInfo`,5,{condition:'this.condition'}),
+        model: new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/AndroidCheckInfo`,5,{condition:'this.condition'}),
         showModal: false,
         param: null,
       }

package/src/components/android/Announcement.vue

@@ -2,7 +2,7 @@
   <div class="auto" style="height: 100%">
     <criteria-paged :model="model"  v-ref:paged>
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div partial>
+        <div partial v-show="false">
           <form>
             <img @click="$parent.$parent.getNewOrder" src="../../assets/shuaxindaiban1.png" style="position: fixed;right: 3%; bottom: 20%;">
           </form>
@@ -17,19 +17,18 @@
                 <div class="col-xs-12" style="display: flex">
                   <p class="panel-title col-xs-7 text-left font" style="margin: 8px auto;word-break: break-all;white-space: normal;font-size: 18px;text-align: center;"><b>{{ row.f_title }}</b></p>
                 </div>
-                <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>发&ensp;送&ensp;人:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 79%;float: left">{{ row.f_send_people }}
-                  </p>
-                </div>
-                <div class="col-xs-12" style="margin-top: 8px">
-                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>发送时间:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 79%;float: left">{{ row.f_sendtime }}</p>
-                </div>
-
+<!--                <div class="col-xs-12">-->
+                <!--                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>发&ensp;送&ensp;人:</b></p>-->
+                <!--                  <p class="panel-title text-left input-font" style="width: 79%;float: left">{{ row.f_send_people }}-->
+                <!--                  </p>-->
+                <!--                </div>-->
+                <!--                <div class="col-xs-12" style="margin-top: 8px">-->
+                <!--                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>发送时间:</b></p>-->
+                <!--                  <p class="panel-title text-left input-font" style="width: 79%;float: left">{{ row.f_sendtime }}</p>-->
+                <!--                </div>-->
                 <div class="col-xs-12" style="margin-top: 8px">
-                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>公告内容:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 79%;float: left">{{ row.f_content }}</p>
+<!--                                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>公告内容:</b></p>&ndash;&gt;-->
+                  <p class="panel-title text-left input-font" style="float: left;word-wrap: break-word;word-break: break-all;">{{ row.f_content }}</p>
                 </div>
 
               </div>
@@ -50,7 +49,7 @@
     title: '安检公告',
     data () {
       return {
-        model:new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/FetchAnnouncement`, 20, {f_filialeids:"this.f_filialeid", orderitem: "'id desc'"}),
+        model:new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/FetchAndroidAnnouncement`, 20, {f_filialeids:"this.f_filialeid", orderitem: "'id desc'"}),
         showModal:false,
         signs: [
           {label:'请选择录入状态', value:''},
@@ -75,7 +74,9 @@
       }
     },
     ready () {
-      this.model.f_filialeid="('305')"
+      this.model.f_filialeid=Vue.user.orgid
+      console.log("aaaaaaaaaaaaaaaaaaa")
+      console.log(this.model.f_filialeid)
       this.$refs.paged.$refs.cri.search()
     },
     computed: {
@@ -90,33 +91,33 @@
       getNewOrder(){
         this.$refs.paged.$refs.cri.search()
       },
-      inspect (info){
-        info.id = ''
-        info.f_state = '未检'
-        info.f_no_checkplan = '无计划安检'
-        console.log("----------INFO---------"+JSON.stringify(info))
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
-          console.log(JSON.stringify(response))
-          info['f_plan_meters'] = response.data
-          var pardate = {
-            _this:this,
-            tittle:'安检详情',
-            safe:true
-          }
-          this.$dispatch('gotoson',pardate)
-          if(info.f_user_type=='民用'){
-            this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', this.reload)
-          }else if(info.f_user_type=='非民用'){
-            this.$goto('safecheck-order-v-cli', {item: info, role: 'inspect'}, 'self', this.reload)
-          }else{
-            this.$showMessage('当前用户类型不明确，请联系管理员！')
-          }
-
-
-        }).catch((err)=>{
-          this.$showMessage('网络异常，请稍后再试！')
-        })
-      }
+      // inspect (info){
+      //   info.id = ''
+      //   info.f_state = '未检'
+      //   info.f_no_checkplan = '无计划安检'
+      //   console.log("----------INFO---------"+JSON.stringify(info))
+      //   this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+      //     console.log(JSON.stringify(response))
+      //     info['f_plan_meters'] = response.data
+      //     var pardate = {
+      //       _this:this,
+      //       tittle:'安检详情',
+      //       safe:true
+      //     }
+      //     this.$dispatch('gotoson',pardate)
+      //     if(info.f_user_type=='民用'){
+      //       this.$goto('safecheck-order-v', {item: info, role: 'inspect'}, 'self', this.reload)
+      //     }else if(info.f_user_type=='非民用'){
+      //       this.$goto('safecheck-order-v-cli', {item: info, role: 'inspect'}, 'self', this.reload)
+      //     }else{
+      //       this.$showMessage('当前用户类型不明确，请联系管理员！')
+      //     }
+      //
+      //
+      //   }).catch((err)=>{
+      //     this.$showMessage('网络异常，请稍后再试！')
+      //   })
+      // }
     }
   }
 </script>