safecheck-client 3.0.33-6 → 3.0.33-61

package/src/filiale/dexin/android/SafecheckDevices.vue

@@ -737,7 +737,7 @@ export default {
     },
     getGasAberrantNumber(val) {
       //tag
-      if(!this.f_table_base.index || !this.f_gas_balance.index){
+      if(!this.f_table_base.index || !this.f_gas_balance.index || !this.f_gas_aberrant_number.index){
         //tag
         return
       }

package/src/filiale/dexin/android/WebMeterOpen.vue

@@ -214,7 +214,7 @@ export default {
       this.criteriaShow = !this.criteriaShow
     },
     async selfSearch (args) {
-      args.condition = `${args.condition} and f_filialeids = '${Vue.user.f_orgids}'`
+      args.condition = `${args.condition} and f_orgid = '${Vue.user.orgid}'`
       await this.model.search(args.condition, args.model)
     },
     search () {

package/src/filiale/dexin/android/WebMeterOpenEdit.vue

@@ -85,7 +85,7 @@ import Vue from 'vue'
 
 export default {
   title: '物联网表单户开通',
-  data () {
+  data() {
     return {
       showpictrue: false,
       showd: false,
@@ -106,27 +106,22 @@ export default {
     }
   },
   props: {},
-  async ready () {
+  async ready() {
     await this.readyInit()
   },
   methods: {
-    readyInit () {
+    readyInit() {
       this.tabname = this.data.tabname
       console.log('-----------------------------------this.tabname', this.tabname)
       this.model = Object.assign({}, this.model, this.data)
-      this.model.f_gas_person=Vue.user.name
+      this.model.f_gas_person = Vue.user.name
     },
-    cameraCallBack (prop, fileName) {
+    cameraCallBack(prop, fileName) {
       HostApp.__this__.model.f_notified_path = fileName + '?' + Math.random()
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
-    // 返回回调函数
-    goback (val) {
-      this.$dispatch('backarrdel')
-      this.$back()
-    },
-    async commit () {
+    async commit() {
       if (!this.model.f_gas_person) {
         this.$showMessage(`请填写通气人`, ['confirm', 'cancel'])
         return
@@ -134,46 +129,39 @@ export default {
       let param = {
         f_user_id: this.model.f_user_id,
         f_userinfo_id: this.model.f_userinfo_id,
-        f_meternumber: this.model.f_meternumber,
-        version: this.model.version,
-        f_table_state: '正常',
         f_open_date: Util.toStandardTimeString(),
         f_open_person: Vue.user.name,
         f_comments: this.model.f_comments,
-        f_gas_person: this.model.f_gas_person,
-        f_operat_type: '开通',
-        f_describe: `${Vue.user.name}对用户${this.model.f_user_name}进行开通操作`,
         f_state: '有效',
         f_operator: Vue.user.name,
-        f_filiale: Vue.user.f_fengongsi,
-        f_outlets: Vue.user.f_parentname,
-        f_orgstr: Vue.user.orgpathstr,
-        f_filialeids: Vue.user.f_orgids,
-        userfiles: {
-          f_user_id: this.model.f_user_id,
-          f_meternumber: this.model.f_meternumber,
-          version: this.model.version,
-          f_table_state: '正常',
-          f_gas_date: Util.toStandardTimeString(),
-          f_gas_person: this.model.f_gas_person,
-          f_open_date: Util.toStandardTimeString()
-        }
+        f_operatorid: Vue.user.id,
+        f_orgname: Vue.user.orgs,
+        f_orgid: Vue.user.orgid,
+        f_depid: Vue.user.orgid,
+        f_depname: Vue.user.orgs,
+        f_meternumber: this.model.f_meternumber,
+        version: this.model.version,
+        f_table_state: '正常',
+        f_gas_date: Util.toStandardTimeString(),
+        f_gas_person: this.model.f_gas_person,
+        f_userfiles_id: this.model.f_userfiles_id
       }
       this.$showMessage(`开通前请确认表号和表类型！！！`, ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_open_meter`, param, {rejectMsg: '开通失败', resolveMsg: '开通成功'}).then(res=>(
-            this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/updateUserfiles`, param.userfiles).then((res) => {
-              if (res.data == 200){this.$back()}else {this.$showMessage('网络异常，请稍后再试')}
-            })
-          ))
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/updateUserfiles`, param).then((res) => {
+            if (res.data == 200) {
+              this.$showMessage('开通成功')
+            } else {
+              this.$showMessage('网络异常，请稍后再试')
+            }
+          })
         }
       })
-
     },
 
   },
   watch: {
-    'data' () {
+    'data'() {
     }
   }
 }

package/src/filiale/fugou/pc/AddToCheckBook.vue

@@ -3,11 +3,11 @@
     <div class="auto select-overspread">
       <validator name='v'>
         <ul class="nav nav-tabs">
-          <p class="bg-info text-center" style="padding: 8px;">{{tabstitles[$parent.$refs.tabs.active]}}</p>
+          <p class="bg-info text-center" style="padding: 8px;">添加到目标安检册</p>
         </ul>
-        <div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;" v-show="!($parent.$refs.tabs.active == 2)">
+        <div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;">
           <div class="row" style="text-align: center">
-
+            <p class="text-center" style="padding: 8px;">共{{usernum?usernum:0}}位用户</p>
             <div class="col-sm-12 form-group" :class="[$v.f_check_book_num.required ? 'has-error' : '']">
               <label class="font_normal_body" style="width: 26%;">目标安检册</label>
               <input type="text" v-model="model.f_check_book_num" v-show="false"
@@ -18,9 +18,18 @@
                         style="width:60%"
                         close-on-select></v-select>
             </div>
+            <!--
+             <div class="col-sm-6 form-group" :class="[$v.f_invoice_type.required ? 'has-error' : '']">
+              <label class="font_normal_body">发票类型</label>
+              <input type="text" v-model="model.f_invoice_type" v-show="false" v-validate:f_invoice_type='{required: true }'>
+              <v-select :value.sync="model.f_invoice_type" :options='invoiceType' :value-single="true" :search="false"
+                        placeholder='发票类型' close-on-select v-model='model.f_invoice_type'>
+              </v-select>
+            </div>
+            -->
           </div>
         </div>
-        <div class="row"  v-show="!($parent.$refs.tabs.active == 2)">
+        <div class="row">
           <div style="float:right;margin-top: 250px;margin-right: 20px;">
             <button @click="confirm()" class="btn button_search" style="width: 70px" :disabled='!$v.valid'>
               <span class="glyphicon glyphicon-floppy-disk"></span>保存
@@ -30,129 +39,57 @@
       </validator>
     </div>
   </div>
-
 </template>
 
 <script>
-  import * as Util from '../../../components/Util'
-  import {HttpResetClass} from "vue-client";
-  import bus from "../../../bus";
-  export default {
-    name: 'AddTobook',
-
-    data () {
-      return {
-        model:{
-          f_check_book_num:''
-        },
-        checkbook: [],
-        checkbooks:[],
-        tabstitles:['请选择小区添加到目标安检册','请选择单位添加到目标安检册','用户无法单独添加到安检册内']
-      }
-    },
-    created () {
-    },
-    ready () {
-      // this.close()
-      new HttpResetClass().load('POST','rs/sql/safe_singleTable_OrderBy',{data: {
-          items: 'id,f_check_book_name,f_check_book_type,f_user_type',
-          tablename: 't_check_book',
-          condition: `1=1`,
-          orderitem: 'id'
-        }}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-        console.log("checkbook", res.data)
-        res.data.forEach(item=>{
-          this.checkbooks.push({
-            f_user_type:item.f_user_type,
-            booktype:item.f_check_book_type,
-            label:item.f_check_book_name,
-            value:item.id
-          })
-        })
-        this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
-      })
-    },
-    methods: {
-       selectbook(val){
-
-      },
-      close () {
-
+export default {
+  name: 'AddTobook',
+  props: ['usernum'],
+  data () {
+    return {
+      model: {
+        f_check_book_num: '',
+        f_userinfo_code: '',
+        f_user_state: '',
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps,
+        f_state: '有效'
       },
-
-      confirm () {
-         if (!this.model.f_check_book_num){
-           this.$showMessage('请选择安检册')
-           return
-         }
-        console.log(this.$parent.$refs.tabs.active)
-        console.log(this.$parent.bookList)
-        console.log(this.$parent.bookAll)
-        console.log(this.$parent.bookCondition)
-        let userCondition = ''
-        if(this.$parent.bookAll){
-          if(!this.$parent.bookCondition){
-            this.$showMessage("请先查询")
-            return
-          }else{
-            userCondition = this.$parent.bookCondition
-          }
-        }else if(this.$parent.bookList.length > 0){
-          userCondition = this.$parent.$refs.tabs.active ===0? 'ta.id in (' + this.$parent.bookList.toString() + ')':
-            'tc.id in (' + this.$parent.bookList.toString() + ')'
-        }else{
-          this.$showMessage(this.$parent.$refs.tabs.active===0?'请选择小区':'请选择单位')
-          return;
-        }
-        if(this.$parent.$refs.tabs.active ===0){
-          new HttpResetClass().load('POST', 'rs/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
-                f_check_book_type:'小区',condition:userCondition}},
-            {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
-            if(res && res.data){
-              this.model.f_check_book_num = ""
-              this.$showMessage("本次成功添加"+res.data+"个小区",['confirm']).then(res=>{
-                if(res==='confirm'){
-                  console.log("刷新了")
-                  bus.$emit('fresh-area')
-                }
-              })
-            }else{
-              this.$showMessage("添加失败")
-            }
-          })
-        }else{
-          new HttpResetClass().load('POST', 'rs/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
-                f_check_book_type:'单位',condition:userCondition}},
-            {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
-            if(res && res.data){
-              this.model.f_check_book_num = ""
-              this.$showMessage("本次成功添加"+res.data+"个单位",['confirm']).then(res=>{
-                if(res==='confirm'){
-                  console.log("刷新了")
-                  bus.$emit('fresh-area')
-                }
-              })
-            }else{
-              this.$showMessage("添加失败")
-            }
-          })
-        }
-      }
+      checkbook: [],
+      f_orgid: ''
+    }
+  },
+  created () {
+  },
+  async ready () {
+    // await this.$LoadParams.loadMeterBook(this.f_filialeid)
+    this.$refs.paged.$refs.cri.model.performDate = this.$login.toStandardDateString()
+    // this.close()
+  },
+  methods: {
+    selectbook(val){
+      console.log("val",val)
+      this.checkbook=val
+      console.log(" this.checkbook.push(val)", this.checkbook)
     },
-    watch:{
-      '$parent.$refs.tabs.active'(val){
-        if(val =='0'){
-          this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
-        }else{
-          this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='非民用')
-        }
-        this.model.f_check_book_num = ''
-      }
+    close () {
+      this.model.f_check_book_num = ''
+      this.$dispatch('add-tobook-refresh')
     },
-    computed: {
-
+    confirm () {
+      this.$dispatch('add-tobook-confirm', this.model)
     }
+  },
+  computed: {
+    // meterbooks () {
+    //   return [{label: '移出表册', value: 'null'}, ...this.$GetSaleParam.getMeterBooks()]
+    // }
   }
+}
 </script>
 
 <style lang="less">

package/src/filiale/fugou/pc/CheckBook.vue

@@ -218,6 +218,8 @@ export default {
     showdetails (row) {
       console.log('showdetails',row)
       this.rowData = row
+      this.rowData.f_check_book_type='用户'
+      this.rowData.f_user_type=''
       this.showItem = false
       this.showItemUser = true
     },

package/src/filiale/fugou/pc/CheckBookEntry.vue

@@ -3,18 +3,18 @@
     <div class="binary-left">
       <tabset v-ref:tabs :close="false" class="nav-tabss">
         <tab header="用户查询">
-          <check-book-search-user @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition" :showtype="showtype"></check-book-search-user>
-        </tab>
-        <tab header="小区查询">
-          <check-book-search-area @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-area>
+          <check-book-search-user @childre="childre" v-ref:mbpeople_list></check-book-search-user>
         </tab>
+<!--        <tab header="小区查询">-->
+<!--          <check-book-search-area @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-area>-->
+<!--        </tab>-->
 <!--        <tab header="单位查询">-->
 <!--          <check-book-search-unit @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-unit>-->
 <!--        </tab>-->
       </tabset>
     </div>
     <div class="binary-right">
-      <add-to-check-book @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></add-to-check-book>
+      <add-to-check-book v-ref:selectbok :usernum="rowsdata.length" v-if="AddTobookShow"></add-to-check-book>
     </div>
   </div>
 </template>
@@ -26,9 +26,9 @@
     title: '添加用户到片区',
     data () {
       return {
-        bookList: [],
-        bookCondition:"",
-        bookAll: false
+        AddTobookShow: true,
+        rowsdata: null,
+        condition: ''
       }
     },
     props: {
@@ -41,20 +41,48 @@
     ready () {
     },
     methods: {
-      setBookList(val){
-        console.log("555555")
-        // console.log("66666",val)
-        this.bookList = val
-      },
-      setBookAll(val){
-        this.bookAll = val
-      },
-      setCondition(val){
-        this.bookCondition = val
+      childre(val){
+        this.$refs.selectbok.selectbook(val)
       },
+      refresh () {
+
+      }
     },
     events: {
-
+      'add-tobook-refresh' () {
+        this.refresh()
+      },
+      'add-tobook-confirm' (model) {
+        this.rowsdata = this.$refs.mbpeople_list.$refs.paged.$refs.grid.getRowData()
+        let msg = '确认将选中的用户全部移入表册？'
+        if (this.rowsdata === null || this.rowsdata.length == 0) {
+          this.$showAlert('请勾选用户！！', 'warning', 3000)
+        } else {
+          let userfilesids = []
+          this.rowsdata.forEach((row) => {
+            userfilesids.push(row.f_userinfo_id + '')
+          })
+          // 变成可以直接使用的格式
+          this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
+            if (res === 'confirm') {
+              this.$resetpost('rs/logic/updateCheckBook', {f_check_book_id: model.f_check_book_num,rowsdata: userfilesids}, {
+                resolveMsg: '保存成功',
+                rejectMsg: '保存失败！'
+              }).then(() => {
+                // 刷新查询
+                this.$refs.mbpeople_list.rowsdata = []
+                this.$refs.mbpeople_list.getmeterbook()
+                this.rowsdata = []
+                this.$parent.meterbookEntryShow = false
+                this.$refs.mbpeople_list.unnullrowdata = []
+                this.$refs.mbpeople_list.radio = []
+                this.refresh()
+                this.$refs.mbpeople_list.$refs.paged.$refs.cri.search()
+              })
+            }
+          })
+        }
+      }
     }
   }
 </script>

package/src/filiale/fugou/pc/CheckBookList.vue

@@ -117,7 +117,7 @@
               <nobr>创建人</nobr>
             </th>
             <th>
-              <nobr>小区/单位数量</nobr>
+              <nobr>用户数量</nobr>
             </th>
             <th>
               <nobr>已下发</nobr>
@@ -143,7 +143,7 @@
           <td  style="text-align: center;">{{ row.f_user_type }}</td>
           <td  style="text-align: center;">{{ row.f_create_date }}</td>
           <td  style="text-align: center;">{{ row.f_create_person }}</td>
-          <td  style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.f_user_type==='民用'?row.num2:row.num3}}</b></button></td>
+          <td  style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num2}}</b></button></td>
           <td  style="text-align: center;">{{ row.xiafa }}</td>
           <td  style="text-align: center;">{{ row.f_user_type =='民用'?row.num-row.xiafa:row.num4-row.xiafa }}</td>
           <td  style="text-align: center;">{{ row.yijian }}</td>