safecheck-client 4.0.2-50 → 4.0.2-52

package/src/components/pc/CheckBookCompany.vue

@@ -1,144 +1,144 @@
-<template>
-  <div class="auto select-overspread">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="form-group col-sm-3" >
-              <label class="font_normal_body">单位名称</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='单位名称'
-                     condition="f_company_name like '%{}%'" @keyup.enter="search()">
-            </div>
-            <div class="form-group col-sm-2 button-range" >
-              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
-              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.send()" v-el:cba>下发</button>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
-        <template partial='head' >
-          <tr>
-            <th><nobr><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.checkAll" @change="$parent.$parent.$parent.setCheckAll()"/>全选</nobr></th>
-            <th><nobr>省市区/县</nobr></th>
-            <th><nobr>街道/乡镇</nobr></th>
-            <th><nobr>单位名称</nobr></th>
-            <th><nobr>用户数量</nobr></th>
-            <th><nobr>详细地址</nobr></th>
-          </tr>
-        </template>
-        <template partial='body' >
-          <tr >
-            <td  style="text-align: center;"><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row.id)"  @change="$parent.$parent.$parent.setCheckes(row.id)" /></td>
-            <td style="text-align:center">{{row.f_rea}}</td>
-            <td style="text-align:center">{{row.f_company_street}}</td>
-            <td style="text-align:center">{{row.f_company_name}}</td>
-            <td style="text-align:center"> <button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num?row.num:0}}</b></button></td>
-            <td style="text-align:center">{{row.f_company_position}}</td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-    <modal :show.sync="showSendModal" :backdrop="false" width="90%" height="90%">
-      <article slot="modal-body" class="modal-body" style="height: 80vh">
-        <check-book-search-user-list  v-if="showSendModal" :row="row"  :addcondata="addcondata" :bookrowsdata="{bookrows:checkes,checkAll:checkAll}"  :needprops="needprops":userlogin="userlogin"></check-book-search-user-list>
-      </article>
-      <footer slot="modal-footer">
-      </footer>
-
-    </modal>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass, PagedList} from 'vue-client'
-
-export default {
-  title: '非民用片区单位',
-  props: ['row','needprops'],
-  data () {
-    return {
-      rowdata: this.row,
-      showSendModal:false,
-      checkBookRow:{
-      },
-      userlogin:{
-        id:this.$login.f.id,
-        name:this.$login.f.name,
-        orgid:this.$login.f.orgid,
-        orgstr:this.$login.f.orgs,
-      },
-      model: new PagedList('api/af-safecheck/sql/getCheckBookCompany', 50),
-      checkAll:false,
-      checkes:[],
-      addcondata:'',
-    }
-  },
-  ready(){
-    console.log(this.row)
-    const val = this.row
-    if (val) {
-      this.checkAll=false
-      this.checkes=[]
-      this.rowdata = val
-      const condition  = `f_check_book_id =${val.id}`
-      this.model.search(condition)
-    }
-  },
-  watch: {
-    'row' (val) {
-      if (val) {
-        this.checkAll=false
-        this.checkes=[]
-        this.rowdata = val
-        const condition =  `f_check_book_id =${val.id}`
-        this.model.search(condition)
-      }
-    }
-  },
-  methods: {
-    setCheckAll() {
-      this.checkAll=this.checkAll?false:true;
-      // 全选改变后，清空选中数据
-      this.checkes = []
-    },
-    isChecked(v) {
-      // 如果全选，不在的按选中算，否则，在的按选中算
-      if (this.checkAll) {
-        return this.checkes.indexOf(v) == -1
-      } else {
-        return this.checkes.indexOf(v) != -1
-      }
-    },
-    setCheckes(id) {
-      let index=this.checkes.indexOf(id)
-      if(index<0){
-        this.checkes.push(id)
-      }else{
-        this.checkes.splice(index,1)
-      }
-    },
-    send(){
-      if(!this.checkAll && this.checkes.length == 0){
-        return  this.$showMessage('请选择单位')
-      }
-      this.showSendModal = true
-    },
-    details(row){
-      this.$emit('showuser' ,row)
-    },
-    selfSearch (args) {
-      if (this.rowdata.id) {
-        this.checkAll=false
-        this.checkes=[]
-        args.condition += `and f_check_book_id =${this.rowdata.id}`
-        this.model.search(args.condition)
-        this.addcondata = args.model.f_residential_area ? ` and tc.f_company_name like '%${args.model.f_residential_area}%'`: ''
-      } else {
-        this.$showMessage('请选择片区')
-      }
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto select-overspread">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-3" >
+              <label class="font_normal_body">单位名称</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='单位名称'
+                     condition="f_company_name like '%{}%'" @keyup.enter="search()">
+            </div>
+            <div class="form-group col-sm-2 button-range" >
+              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.send()" v-el:cba>下发</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <th><nobr><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.checkAll" @change="$parent.$parent.$parent.setCheckAll()"/>全选</nobr></th>
+            <th><nobr>省市区/县</nobr></th>
+            <th><nobr>街道/乡镇</nobr></th>
+            <th><nobr>单位名称</nobr></th>
+            <th><nobr>用户数量</nobr></th>
+            <th><nobr>详细地址</nobr></th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <tr >
+            <td  style="text-align: center;"><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row.id)"  @change="$parent.$parent.$parent.setCheckes(row.id)" /></td>
+            <td style="text-align:center">{{row.f_rea}}</td>
+            <td style="text-align:center">{{row.f_company_street}}</td>
+            <td style="text-align:center">{{row.f_company_name}}</td>
+            <td style="text-align:center"> <button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num?row.num:0}}</b></button></td>
+            <td style="text-align:center">{{row.f_company_position}}</td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="showSendModal" :backdrop="false" width="90%" height="90%">
+      <article slot="modal-body" class="modal-body" style="height: 80vh">
+        <check-book-search-user-list  v-if="showSendModal" :row="row"  :addcondata="addcondata" :bookrowsdata="{bookrows:checkes,checkAll:checkAll}"  :needprops="needprops":userlogin="userlogin"></check-book-search-user-list>
+      </article>
+      <footer slot="modal-footer">
+      </footer>
+
+    </modal>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+
+export default {
+  title: '非民用片区单位',
+  props: ['row','needprops'],
+  data () {
+    return {
+      rowdata: this.row,
+      showSendModal:false,
+      checkBookRow:{
+      },
+      userlogin:{
+        id:this.$login.f.id,
+        name:this.$login.f.name,
+        orgid:this.$login.f.orgid,
+        orgstr:this.$login.f.orgs,
+      },
+      model: new PagedList('api/af-safecheck/sql/getCheckBookCompany', 50),
+      checkAll:false,
+      checkes:[],
+      addcondata:'',
+    }
+  },
+  ready(){
+    console.log(this.row)
+    const val = this.row
+    if (val) {
+      this.checkAll=false
+      this.checkes=[]
+      this.rowdata = val
+      const condition  = `f_check_book_id =${val.id}`
+      this.model.search(condition)
+    }
+  },
+  watch: {
+    'row' (val) {
+      if (val) {
+        this.checkAll=false
+        this.checkes=[]
+        this.rowdata = val
+        const condition =  `f_check_book_id =${val.id}`
+        this.model.search(condition)
+      }
+    }
+  },
+  methods: {
+    setCheckAll() {
+      this.checkAll=this.checkAll?false:true;
+      // 全选改变后，清空选中数据
+      this.checkes = []
+    },
+    isChecked(v) {
+      // 如果全选，不在的按选中算，否则，在的按选中算
+      if (this.checkAll) {
+        return this.checkes.indexOf(v) == -1
+      } else {
+        return this.checkes.indexOf(v) != -1
+      }
+    },
+    setCheckes(id) {
+      let index=this.checkes.indexOf(id)
+      if(index<0){
+        this.checkes.push(id)
+      }else{
+        this.checkes.splice(index,1)
+      }
+    },
+    send(){
+      if(!this.checkAll && this.checkes.length == 0){
+        return  this.$showMessage('请选择单位')
+      }
+      this.showSendModal = true
+    },
+    details(row){
+      this.$emit('showuser' ,row)
+    },
+    selfSearch (args) {
+      if (this.rowdata.id) {
+        this.checkAll=false
+        this.checkes=[]
+        args.condition += `and f_check_book_id =${this.rowdata.id}`
+        this.model.search(args.condition)
+        this.addcondata = args.model.f_residential_area ? ` and tc.f_company_name like '%${args.model.f_residential_area}%'`: ''
+      } else {
+        this.$showMessage('请选择片区')
+      }
+    }
+  }
+}
+</script>

package/src/components/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', 'api/af-safecheck/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', 'api/af-safecheck/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>