safecheck-client 3.0.32-gongyi → 3.0.35-gongyi

package/src/components/pc/CheckBook.vue

@@ -1,67 +1,67 @@
-<template>
-  <!--安检综合查询主界面-->
-  <div id="unit" class="flex-row" :class="{'binary':showItem}">
-    <div :class="{'basic-main':!showItem,'binary-left':showItem}">
-      <!--展示查询界面-->
-      <check-book-list :permission="permission" class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
-                         @canel-main="close" v-ref:checkbook></check-book-list>
-    </div>
-    <div class="binary-right" v-show="showItem">
-      <div class="flex">
-        <check-book-user style="height: 100%" :row="rowData"></check-book-user>
-      </div>
-    </div>
-  </div>
-
-</template>
-
-<script>
-export default {
-  title: '安检册管理',
-  name: 'CheckPaperSearchUser',
-  data () {
-    return {
-      style: 'col-sm-2 form-group',
-      style2: 'col-sm-4 form-group',
-      hidden: true,
-      barwidth: '100%',
-      showItem: false,
-      rowData: {}
-    }
-  },
-  props: ['permission'],
-  methods: {
-    show () {
-      this.showItem = this.showItem ? false : true
-    },
-    selected (row) {
-      this.showItem = true
-      this.barwidth = '50%'
-      console.log('88888888888', row.val)
-      this.rowData = row.val
-      this.hidden = false
-      console.log('2.现在的状态是:' + this.hidden)
-    },
-
-    close () {
-      this.showItem = false
-      this.barwidth = '100%'
-      this.hidden = true
-    }
-  },
-  watch: {
-    'showItem' (val) {
-      console.log(val)
-      if (val) {
-        this.style = 'col-sm-3 form-group'
-        this.style2 = 'col-sm-6 form-group'
-      } else {
-        this.style = 'col-sm-2 form-group'
-        this.style2 = 'col-sm-4 form-group'
-      }
-    }
-  }
-}
-
-</script>
-
+<template>
+  <!--安检综合查询主界面-->
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+    <div :class="{'basic-main':!showItem,'binary-left':showItem}">
+      <!--展示查询界面-->
+      <check-book-list :permission="permission" class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
+                         @canel-main="close" v-ref:checkbook></check-book-list>
+    </div>
+    <div class="binary-right" v-show="showItem">
+      <div class="flex">
+        <check-book-user style="height: 100%" :row="rowData"></check-book-user>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+export default {
+  title: '安检册管理',
+  name: 'CheckPaperSearchUser',
+  data () {
+    return {
+      style: 'col-sm-2 form-group',
+      style2: 'col-sm-4 form-group',
+      hidden: true,
+      barwidth: '100%',
+      showItem: false,
+      rowData: {}
+    }
+  },
+  props: ['permission'],
+  methods: {
+    show () {
+      this.showItem = this.showItem ? false : true
+    },
+    selected (row) {
+      this.showItem = true
+      this.barwidth = '50%'
+      console.log('88888888888', row.val)
+      this.rowData = row.val
+      this.hidden = false
+      console.log('2.现在的状态是:' + this.hidden)
+    },
+
+    close () {
+      this.showItem = false
+      this.barwidth = '100%'
+      this.hidden = true
+    }
+  },
+  watch: {
+    'showItem' (val) {
+      console.log(val)
+      if (val) {
+        this.style = 'col-sm-3 form-group'
+        this.style2 = 'col-sm-6 form-group'
+      } else {
+        this.style = 'col-sm-2 form-group'
+        this.style2 = 'col-sm-4 form-group'
+      }
+    }
+  }
+}
+
+</script>
+

package/src/components/pc/CheckBookList.vue

@@ -15,10 +15,10 @@
                 condition=" f_checker_name = '{}'">
               </role-selector-safe>
             </div>
-            <div :class="$parent.$parent.style">
+            <div :class="$parent.$parent.style" v-if="$parent.$parent.permission === 'c1'">
               <label class="font_normal_body">安检科室</label>
-              <right-tree islist :userid="$parent.$parent.userid" :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="选择科室" :selectData="''" v-ref:f_reciever>
-              </right-tree>
+              <right-tree-safe islist :userid="$parent.$parent.userid" :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="'选择科室'" :selectData="''" v-ref:f_reciever>
+              </right-tree-safe>
           </div>
 
             <div :class="$parent.$parent.style"   >
@@ -47,11 +47,10 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
-<!--              <export-excel-safe :data="$parent.$parent.searchData"-->
-<!--                                 :field="$parent.$parent.excelHeaders"-->
-<!--                                 :choose-col="true"-->
-<!--                                 sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"-->
-<!--                                 template-name='用户安检情况'></export-excel-safe>-->
+              <export-excel-safe :data="$parent.$parent.exportParameter"
+                                 :field="$parent.$parent.excelHeaders"
+                                 sqlurl="rs/logic/SafeExportExcel" sql-name="QueryCheckBook"
+                                 template-name='安检册详情列表'></export-excel-safe>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -89,10 +88,10 @@
                      placeholder="安检册名" condition="f_check_book_name like '%{}%'">
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
-<!--              <export-excel-safe :data="$parent.$parent.searchData"-->
-<!--                                 :field="$parent.$parent.excelHeaders"-->
-<!--                                 sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"-->
-<!--                                 template-name='用户安检情况'></export-excel-safe>-->
+              <export-excel-safe :data="$parent.$parent.exportParameter"
+                                 :field="$parent.$parent.excelHeaders"
+                                 sqlurl="rs/logic/SafeExportExcel" sql-name="QueryCheckBook"
+                                 template-name='安检册详情列表'></export-excel-safe>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -105,10 +104,10 @@
 
           </div>
           <div class="row" v-show="$parent.$parent.$parent.showItem">
-            <div :class="$parent.$parent.style">
+            <div :class="$parent.$parent.style"  v-if="$parent.$parent.permission === 'c1'">
               <label class="font_normal_body">安检科室</label>
-              <right-tree islist :userid="$parent.$parent.userid" :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="选择科室" :selectData="''" v-ref:f_reciever>
-              </right-tree>
+              <right-tree-safe islist :userid="$parent.$parent.userid" :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="选择科室" :selectData="''" v-ref:f_reciever>
+              </right-tree-safe>
             </div>
 
             <div :class="$parent.$parent.style"   >
@@ -151,6 +150,9 @@
             <th>
               <nobr>创建人</nobr>
             </th>
+            <th>
+              <nobr>所属科室</nobr>
+            </th>
             <th>
               <nobr>所属安检员</nobr>
             </th>
@@ -163,6 +165,9 @@
             <th>
               <nobr>用户数量</nobr>
             </th>
+            <th>
+              <nobr>下发时间</nobr>
+            </th>
             <th>
               <nobr>操作</nobr>
             </th>
@@ -172,10 +177,12 @@
           <td  style="text-align: center;">{{ row.f_check_book_name }}</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;">{{ row.f_dep }}</td>
           <td  style="text-align: center;">{{ row.f_checker_name }}</td>
           <td  style="text-align: center;">{{ row.f_run_date }}</td>
           <td  style="text-align: center;">{{ row.f_around_time }}{{ row.f_around_unit }}</td>
           <td  style="text-align: center;">{{ row.num }}</td>
+          <td  style="text-align: center;">{{ row.f_issue_time }}</td>
           <td  style="text-align: center;">
             <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.deleteCheckBook(row)' v-if="$parent.$parent.$parent.permission === 'c1'">删除</button>
             <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.updateCheckBook(row)'>修改</button>
@@ -200,8 +207,8 @@
             <!--            </div>-->
             <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c1' && showModal ">
               <label class="font_normal_body">安检科室</label>
-              <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择科室" :selectData="" v-ref:f_reciever>
-              </right-tree>
+              <right-tree-safe islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="'选择科室'" :select-data="{id:checkBook.f_depid}" v-ref:f_reciever>
+              </right-tree-safe>
             </div>
             <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c2' ">
               <label class="font_normal_body">安&ensp;检&ensp;员</label>
@@ -268,18 +275,16 @@ export default {
       aroundUnit: [{label: '年', value: '年'}, {label: '月', value: '月'}, {label: '日', value: '月'}],
       showModal:false,
       excelHeaders: {
-
-        'f_userinfo_code': '用户编号',
-        'f_user_name': '用户名称',
-        'f_user_phone': '用户电话',
-        'f_meternumber': '用户表号',
-        'f_user_type': '用户类型',
-        'f_last_checker': '安检员',
-        'f_residential_area': '小区名称',
-        'f_address': '地址',
-        'f_last_check_date': '安检日期',
-        'f_last_check_state': '安检状态',
-        'f_last_check_result': '安检结果'
+        'f_check_book_name': '安检册名称',
+        'f_create_date': '创建日期',
+        'f_create_person': '创建人',
+        'f_dep': '所属科室',
+        'f_checker_name': '所属安检员',
+        'f_run_date': '执行日期',
+        'f_around_time': '执行周期',
+        'f_around_unit': '周期单位',
+        'num': '用户数量',
+        'f_issue_time': '下发时间'
       },
       checkers:[],
       f_depid:'',
@@ -297,6 +302,7 @@ export default {
         f_create_person: '',
         f_orgid: '',
         f_depid:'',
+        f_dep:'',
         f_checker_name: '',
         f_checker_id:''
       }
@@ -324,17 +330,21 @@ export default {
   },
   methods: {
     reres(val) {
-      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined'){
+      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || val.resids.length>1){
         return
       }
       console.log('val2',val)
       const resids = val.orgobj.filter(res=>res.resourcetype==='department')
+      console.log('val2',resids)
       if (resids.length>0){
       this.checkBook.f_depid = resids[0].id
+      this.checkBook.f_dep = resids[0].name
     }
     },
     reres2(val){
-      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined'){
+      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || !val.resids[0] || val.resids.length>1){
+        console.log('未选择',val)
+        this.f_depid = ''
         return
       }
       console.log('val2',val)
@@ -344,6 +354,10 @@ export default {
       }
     },
     topPlanItem(val){
+      if(!val.f_depid){
+        this.$showMessage('请补全科室后在进行下发')
+        return
+      }
       this.isSend = true
       console.log('val', val)
 
@@ -362,7 +376,9 @@ export default {
         f_create_time : Util.toStandardDateString(),
         f_safecheck_type : '年度普检',
         f_checker : checkBook.f_checker_name,
-        f_checker_id:checkBook.f_checker_id
+        f_checker_id:checkBook.f_checker_id,
+        f_depid:checkBook.f_depid,
+        f_dep:checkBook.f_dep
       }
 
       if (checkBook.f_around_unit === '年'){
@@ -375,7 +391,7 @@ export default {
       let month = nextDate.getMonth()+1
       let date = nextDate.getDate()
       checkBook.f_run_date = nextDate.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
-
+      checkBook.f_issue_time = nextDate.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
 
       let data ={
         checkBook,
@@ -465,6 +481,7 @@ export default {
         f_create_person: '',
         f_orgid: '',
         f_depid:'',
+        f_dep:'',
         f_checker_name: '',
         f_checker_id:''
       }
@@ -475,7 +492,9 @@ export default {
 
     },
     updateCheckBook(val){
+      console.log(val)
       this.checkBook=val
+      console.log(this.checkBook)
       this.showModal = true
     },
     search (args) {
@@ -486,7 +505,6 @@ export default {
       }
       if (this.f_depid && this.permission === 'c1'){
         args.condition +=` and tcb.f_depid = '${this.f_depid}'`
-
       }
       return this.model.search(args.condition, args.model)
     },
@@ -518,6 +536,12 @@ export default {
   watch: {
   },
   computed: {
+    // 导出到Excel的条件构造
+    exportParameter() {
+      return {
+        condition: this.$refs.paged.model.condition
+      }
+    },
     selected () {
       return this.$refs.paged.$refs.grid.selected
     }

package/src/components/pc/CheckBookManage.vue

@@ -453,6 +453,7 @@ export default {
         f_create_person: this.$login.f.name,
         f_orgid: this.$login.f.orgid,
         f_depid:'',
+        f_dep:'',
         f_checker_name: '',
         f_checker_id:''
       },
@@ -544,11 +545,16 @@ export default {
       })
     },
     reres(val){
-      if (!val.resids){
+      if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || val.resids.length>1){
         return
       }
-      console.log('val',val)
-      this.checkBook.f_depid = val.resids[0]
+      console.log('val2',val)
+      const resids = val.orgobj.filter(res=>res.resourcetype==='department')
+      console.log('val2',resids)
+      if (resids.length>0){
+        this.checkBook.f_depid = resids[0].id
+        this.checkBook.f_dep = resids[0].name
+      }
     },
     clearBook(){
       this.checkBook ={
@@ -560,6 +566,7 @@ export default {
           f_create_person: this.$login.f.name,
           f_orgid: this.$login.f.orgid,
           f_depid:'',
+          f_dep:'',
           f_checker_name: '',
           f_checker_id:''
       }

package/src/components/pc/CheckBookUser.vue

@@ -1,77 +1,77 @@
-<template>
-  <div class="flex">
-    <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_userinfo_code" placeholder='客户编号'
-                     condition="f_userinfo_code = '{}'" @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>
-
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
-        <template partial='head' >
-          <tr>
-            <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;">{{$index+1}}</td>
-             <td style="text-align:center">{{row.f_userinfo_code}}</td>
-            <td style="text-align:center">{{row.f_user_name}}</td>
-            <td style="text-align:center">{{row.f_user_phone}}</td>
-            <td style="text-align:center">{{row.f_address}}</td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import {PagedList} from 'vue-client'
-
-export default {
-  title: '安检记录列表',
-  props: ['row'],
-  data () {
-    return {
-      rowdata: this.row,
-      model: new PagedList('rs/sql/getUserByCheckBook', 50)
-    }
-  },
-  watch: {
-    'row' (val) {
-      if (val) {
-        this.rowdata = val
-        const condition = `f_check_book_id =${val.id}`
-        this.model.search(condition)
-      }
-    }
-  },
-  methods: {
-    selfSearch (args) {
-      if (this.rowdata.id) {
-        args.condition += `and f_check_book_id =${this.rowdata.id}`
-        this.model.search(args.condition)
-      } else {
-        this.$showMessage('请选择安检册')
-      }
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex">
+    <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_userinfo_code" placeholder='客户编号'
+                     condition="f_userinfo_code = '{}'" @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>
+
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <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;">{{$index+1}}</td>
+             <td style="text-align:center">{{row.f_userinfo_code}}</td>
+            <td style="text-align:center">{{row.f_user_name}}</td>
+            <td style="text-align:center">{{row.f_user_phone}}</td>
+            <td style="text-align:center">{{row.f_address}}</td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  title: '安检记录列表',
+  props: ['row'],
+  data () {
+    return {
+      rowdata: this.row,
+      model: new PagedList('rs/sql/getUserByCheckBook', 50)
+    }
+  },
+  watch: {
+    'row' (val) {
+      if (val) {
+        this.rowdata = val
+        const condition = `f_check_book_id =${val.id}`
+        this.model.search(condition)
+      }
+    }
+  },
+  methods: {
+    selfSearch (args) {
+      if (this.rowdata.id) {
+        args.condition += `and f_check_book_id =${this.rowdata.id}`
+        this.model.search(args.condition)
+      } else {
+        this.$showMessage('请选择安检册')
+      }
+    }
+  }
+}
+</script>