safecheck-client 3.0.33-15 → 3.0.33-150

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

@@ -1,161 +1,161 @@
-<template>
-  <div class="auto select-overspread">
-    <validator name='v'>
-      <form class="form-horizontal" novalidate>
-        <ul class="nav nav-tabs" style="margin-bottom: 10px">
-          <li class="active"><a href="#">安检册信息</a></li>
-        </ul>
-        <div class="row" style="margin-top: 10px">
-          <div class="col-sm-12 form-group"  style="margin: 0">
-            <role-selector-safe
-              @alluser="getUsers"
-              @re-res="getRes"
-              role-name="安检员"
-              role-lable="安&nbsp;检&nbsp;员&nbsp;"
-              :value.sync="checkBook.f_checker_name"
-              v-model="checkBook.f_checker_name">
-            </role-selector-safe>
-          </div>
-<!--          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_type.required ? 'has-error' : '']">-->
-<!--            <label class="font_normal_body">表册类型</label>-->
-<!--            <input type="text" v-show="false" v-model="checkBook.f_check_book_type"-->
-<!--                   :value.sync="checkBook.f_check_book_type"-->
-<!--                   v-validate:f_check_book_type='{required: true }'>-->
-<!--            <v-select :value.sync="checkBook.f_check_book_type" v-model='checkBook.f_check_book_type'-->
-<!--                      :value-single="true" style="width: 60%"-->
-<!--                      class="select_list select"-->
-<!--                      :options='bookTypes' placeholder=''-->
-<!--                      close-on-select></v-select>-->
-<!--          </div>-->
-          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_user_type.required ? 'has-error' : '']">
-            <label class="font_normal_body">用户类型</label>
-            <input type="text" v-show="false" v-model="checkBook.f_user_type"
-                   v-validate:f_user_type='{required: true }'>
-            <v-select :value.sync="checkBook.f_user_type" v-model='checkBook.f_user_type'
-                      :value-single="true" style="width: 60%"
-                      class="select_list select"
-                      :options='userTypes' placeholder=''
-                      close-on-select></v-select>
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_name.required ? 'has-error' : '']">
-            <label class="font_normal_body">安检册名称</label>
-            <input type="text" class="input_search" v-model="checkBook.f_check_book_name"
-                   style="width: 60%" v-validate:f_check_book_name='{ required: true }'>
-          </div>
-        </div>
-      </form>
-      <div style="text-align:right;height:auto;margin-top:6px;margin-right: 10%">
-        <button @click="confirm()" class="button_search">确认</button>
-<!--        <button @click="deleteBook()" class="button_delete">删除</button>-->
-        <button @click="close()" class="button_clear">取消</button>
-      </div>
-    </validator>
-  </div>
-</template>
-<script>
-import * as Util from "../../../components/Util";
-import bus from "../../../bus";
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  data () {
-    return {
-      aroundUnit: [{label: '年', value: '年'}, {label: '月', value: '月'}, {label: '日', value: '日'}],
-      bookTypes:[{label: '用户', value: '用户'}, {label: '小区', value: '小区'}],
-      userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
-      autos:[{label: '是', value: '是'}, {label: '否', value: '否'}],
-      allUsers:[],
-      checkBook: {
-        f_check_book_name: '',
-        f_run_date: '',
-        f_around_time: '',
-        f_around_unit: '',
-        f_create_date: '',
-        f_create_person: '',
-        f_user_type:'',
-        f_orgid: '',
-        f_is_auto:'否',
-        f_check_book_type:"小区",
-        f_checker_name: '',
-        f_checker_id:'',
-      }
-    }
-  },
-  props: ['row','showtype'],
-  watch: {
-    'checkBook.f_checker_name' (val) {
-      const user = this.allUsers.filter(item=>item.name==val);
-      if(user.length>0){
-        this.checkBook.f_checker_id = user[0]["id"]
-      }
-      console.log("777",this.checkBook)
-    },
-    row (row) {
-      this.changeCheckBook(row)
-    }
-  },
-  ready () {
-    // console.log(this.$login.f.orgid)
-    this.changeCheckBook(this.row)
-    this.checkBook.f_user_type = this.showtype
-    console.log('row', JSON.stringify(this.row))
-  },
-  methods: {
-    changeCheckBook (row) {
-      console.log('row改变了', row)
-      if (row && row.id) {
-        console.log('进入修改赋值')
-        this.checkBook = row
-      }
-    },
-    deleteBook () {
-      console.log('delete', this.row)
-    },
-    close () {
-      console.log('关闭')
-      this.$parent.showItem = false
-    },
-    confirm () {
-      if(!this.checkBook.f_check_book_name){
-        this.$showMessage('请填写安检册名称')
-        return
-      }
-      // if(!this.checkBook.f_check_book_type){
-      //   this.$showMessage('请选择表册类型')
-      //   return
-      // }
-      if(!this.checkBook.f_user_type){
-        this.$showMessage('请选择用户类型')
-        return
-
-      }
-      this.checkBook.f_orgid = this.$login.f.orgid
-      this.checkBook.f_create_person = this.$login.f.name
-      this.checkBook.f_create_date = Util.toStandardDateString()
-      console.log('checkbook', this.checkBook)
-      let http = new HttpResetClass()
-      http.load('POST', 'rs/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
-        {resolveMsg: '保存安检册信息成功', rejectMsg: '保存安检册信息失败'}).then(res => {
-        if (res.data.code === 200) {
-          this.$showMessage('保存安检册信息成功',['confirm']).then(res=>{
-            if (res==='confirm'){
-              bus.$emit('fresh-main')
-            }
-          })
-        }else{
-          this.$showMessage('保存安检册信息失败')
-        }
-      })
-    },
-    getRes (obj) {
-      if (obj.resids) {
-        this.checkBook.f_orgid = obj.resids[0]
-        console.log('id', this.checkBook.f_orgid)
-      }
-    },
-    getUsers(obj){
-      this.allUsers = obj
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto select-overspread">
+    <validator name='v'>
+      <form class="form-horizontal" novalidate>
+        <ul class="nav nav-tabs" style="margin-bottom: 10px">
+          <li class="active"><a href="#">安检册信息</a></li>
+        </ul>
+        <div class="row" style="margin-top: 10px">
+          <div class="col-sm-12 form-group"  style="margin: 0">
+            <role-selector-safe
+              @alluser="getUsers"
+              @re-res="getRes"
+              role-name="安检员"
+              role-lable="安&nbsp;检&nbsp;员&nbsp;"
+              :value.sync="checkBook.f_checker_name"
+              v-model="checkBook.f_checker_name">
+            </role-selector-safe>
+          </div>
+<!--          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_type.required ? 'has-error' : '']">-->
+<!--            <label class="font_normal_body">表册类型</label>-->
+<!--            <input type="text" v-show="false" v-model="checkBook.f_check_book_type"-->
+<!--                   :value.sync="checkBook.f_check_book_type"-->
+<!--                   v-validate:f_check_book_type='{required: true }'>-->
+<!--            <v-select :value.sync="checkBook.f_check_book_type" v-model='checkBook.f_check_book_type'-->
+<!--                      :value-single="true" style="width: 60%"-->
+<!--                      class="select_list select"-->
+<!--                      :options='bookTypes' placeholder=''-->
+<!--                      close-on-select></v-select>-->
+<!--          </div>-->
+          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_user_type.required ? 'has-error' : '']">
+            <label class="font_normal_body">用户类型</label>
+            <input type="text" v-show="false" v-model="checkBook.f_user_type"
+                   v-validate:f_user_type='{required: true }'>
+            <v-select :value.sync="checkBook.f_user_type" v-model='checkBook.f_user_type'
+                      :value-single="true" style="width: 60%"
+                      class="select_list select"
+                      :options='userTypes' placeholder=''
+                      close-on-select></v-select>
+          </div>
+          <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_name.required ? 'has-error' : '']">
+            <label class="font_normal_body">安检册名称</label>
+            <input type="text" class="input_search" v-model="checkBook.f_check_book_name"
+                   style="width: 60%" v-validate:f_check_book_name='{ required: true }'>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;height:auto;margin-top:6px;margin-right: 10%">
+        <button @click="confirm()" class="button_search">确认</button>
+<!--        <button @click="deleteBook()" class="button_delete">删除</button>-->
+        <button @click="close()" class="button_clear">取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+import * as Util from "../../../components/Util";
+import bus from "../../../bus";
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      aroundUnit: [{label: '年', value: '年'}, {label: '月', value: '月'}, {label: '日', value: '日'}],
+      bookTypes:[{label: '用户', value: '用户'}, {label: '小区', value: '小区'}],
+      userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
+      autos:[{label: '是', value: '是'}, {label: '否', value: '否'}],
+      allUsers:[],
+      checkBook: {
+        f_check_book_name: '',
+        f_run_date: '',
+        f_around_time: '',
+        f_around_unit: '',
+        f_create_date: '',
+        f_create_person: '',
+        f_user_type:'',
+        f_orgid: '',
+        f_is_auto:'否',
+        f_check_book_type:"小区",
+        f_checker_name: '',
+        f_checker_id:'',
+      }
+    }
+  },
+  props: ['row','showtype'],
+  watch: {
+    'checkBook.f_checker_name' (val) {
+      const user = this.allUsers.filter(item=>item.name==val);
+      if(user.length>0){
+        this.checkBook.f_checker_id = user[0]["id"]
+      }
+      console.log("777",this.checkBook)
+    },
+    row (row) {
+      this.changeCheckBook(row)
+    }
+  },
+  ready () {
+    // console.log(this.$login.f.orgid)
+    this.changeCheckBook(this.row)
+    this.checkBook.f_user_type = this.showtype
+    console.log('row', JSON.stringify(this.row))
+  },
+  methods: {
+    changeCheckBook (row) {
+      console.log('row改变了', row)
+      if (row && row.id) {
+        console.log('进入修改赋值')
+        this.checkBook = row
+      }
+    },
+    deleteBook () {
+      console.log('delete', this.row)
+    },
+    close () {
+      console.log('关闭')
+      this.$parent.showItem = false
+    },
+    confirm () {
+      if(!this.checkBook.f_check_book_name){
+        this.$showMessage('请填写安检册名称')
+        return
+      }
+      // if(!this.checkBook.f_check_book_type){
+      //   this.$showMessage('请选择表册类型')
+      //   return
+      // }
+      if(!this.checkBook.f_user_type){
+        this.$showMessage('请选择用户类型')
+        return
+
+      }
+      this.checkBook.f_orgid = this.$login.f.orgid
+      this.checkBook.f_create_person = this.$login.f.name
+      this.checkBook.f_create_date = Util.toStandardDateString()
+      console.log('checkbook', this.checkBook)
+      let http = new HttpResetClass()
+      http.load('POST', 'rs/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
+        {resolveMsg: '保存安检册信息成功', rejectMsg: '保存安检册信息失败'}).then(res => {
+        if (res.data.code === 200) {
+          this.$showMessage('保存安检册信息成功',['confirm']).then(res=>{
+            if (res==='confirm'){
+              bus.$emit('fresh-main')
+            }
+          })
+        }else{
+          this.$showMessage('保存安检册信息失败')
+        }
+      })
+    },
+    getRes (obj) {
+      if (obj.resids) {
+        this.checkBook.f_orgid = obj.resids[0]
+        console.log('id', this.checkBook.f_orgid)
+      }
+    },
+    getUsers(obj){
+      this.allUsers = obj
+    }
+  }
+}
+</script>

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

@@ -1,66 +1,94 @@
-<template>
-  <div id='checkbookEntry' class="flex-row binary">
-    <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>
-        </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>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    name: 'checkBookEntry',
-    title: '添加用户到片区',
-    data () {
-      return {
-        bookList: [],
-        bookCondition:"",
-        bookAll: false
-      }
-    },
-    props: {
-      showtype:{
-        type: String
-      }
-    },
-    created () {
-    },
-    ready () {
-    },
-    methods: {
-      setBookList(val){
-        console.log("555555")
-        // console.log("66666",val)
-        this.bookList = val
-      },
-      setBookAll(val){
-        this.bookAll = val
-      },
-      setCondition(val){
-        this.bookCondition = val
-      },
-    },
-    events: {
-
-    }
-  }
-</script>
-
-<style lang="less">
-  #checkbookEntry {
-    height: 700px;
-  }
-</style>
+<template>
+  <div id='checkbookEntry' class="flex-row binary">
+    <div class="binary-left">
+      <tabset v-ref:tabs :close="false" class="nav-tabss">
+        <tab header="用户查询">
+          <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 v-ref:selectbok :usernum="rowsdata.length" v-if="AddTobookShow"></add-to-check-book>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    name: 'checkBookEntry',
+    title: '添加用户到片区',
+    data () {
+      return {
+        AddTobookShow: true,
+        rowsdata: null,
+        condition: ''
+      }
+    },
+    props: {
+      showtype:{
+        type: String
+      }
+    },
+    created () {
+    },
+    ready () {
+    },
+    methods: {
+      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>
+
+<style lang="less">
+  #checkbookEntry {
+    height: 700px;
+  }
+</style>