safecheck-client 4.0.0-6 → 4.0.0-60

package/src/components/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/components/pc/CheckBookDetails.vue

@@ -3,7 +3,7 @@
     <validator name='v'>
       <form class="form-horizontal" novalidate>
         <ul class="nav nav-tabs" style="margin-bottom: 10px">
-          <li class="active"><a href="#">片区信息</a></li>
+          <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">
@@ -38,43 +38,10 @@
                       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>
+            <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 class="form-group col-sm-6"  style="margin-top: 20px">
-            <label class="font_normal_body">执行日期</label>
-            <datepicker
-              :value.sync="checkBook.f_run_date"
-              style="width: 60%"
-              :format="'yyyy-MM-dd'"
-              v-model="checkBook.f_run_date"
-            >
-            </datepicker>
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px">
-            <label class="font_normal_body">执行周期</label>
-            <input type="number" class="input_search" v-model="checkBook.f_around_time"
-                   style="width: 60%"  >
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px">
-            <label class="font_normal_body">周期单位</label>
-            <v-select :value.sync="checkBook.f_around_unit" v-model='checkBook.f_around_unit'
-                      :value-single="true" style="width: 60%"
-                      class="select_list select"
-                      :options='aroundUnit' placeholder=''
-                      close-on-select></v-select>
-          </div>
-
-
-<!--          <div class="form-group col-sm-6"  style="margin-top: 20px">-->
-<!--            <label class="font_normal_body">自动下发</label>-->
-<!--            <v-select :value.sync="checkBook.f_is_auto" v-model='checkBook.f_is_auto'-->
-<!--                      :value-single="true" style="width: 60%"-->
-<!--                      class="select_list select"-->
-<!--                      :options='autos' placeholder=''-->
-<!--                      close-on-select></v-select>-->
-<!--          </div>-->
         </div>
       </form>
       <div style="text-align:right;height:auto;margin-top:6px;margin-right: 10%">
@@ -150,7 +117,7 @@ export default {
     },
     confirm () {
       if(!this.checkBook.f_check_book_name){
-        this.$showMessage('请填写片区名称')
+        this.$showMessage('请填写安检册名称')
         return
       }
       // if(!this.checkBook.f_check_book_type){
@@ -168,15 +135,15 @@ export default {
       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 => {
+        {resolveMsg: '保存安检册信息成功', rejectMsg: '保存安检册信息失败'}).then(res => {
         if (res.data.code === 200) {
-          this.$showMessage('保存片区信息成功',['confirm']).then(res=>{
+          this.$showMessage('保存安检册信息成功',['confirm']).then(res=>{
             if (res==='confirm'){
               bus.$emit('fresh-main')
             }
           })
         }else{
-          this.$showMessage('保存片区信息失败')
+          this.$showMessage('保存安检册信息失败')
         }
       })
     },

package/src/components/pc/CheckBookEntry.vue

@@ -2,15 +2,15 @@
   <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-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>
         <tab header="用户查询">
           <check-book-search-user @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></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">
@@ -38,7 +38,6 @@
     methods: {
       setBookList(val){
         console.log("555555")
-        // console.log("66666",val)
         this.bookList = val
       },
       setBookAll(val){

package/src/components/pc/CheckBookList.vue

@@ -16,41 +16,41 @@
               </role-selector-safe>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">片区名称</label>
+              <label class="font_normal_body">安检册名称</label>
               <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
                         :value-single="true" style="width: 60%"
                         class="select_list select"
-                        :options='$parent.$parent.checkBooks' placeholder='片区名称'
+                        :options='$parent.$parent.checkBooks' placeholder='安检册名称'
                         close-on-select
                         condition="tcb.id ='{}'"></v-select>
             </div>
-<!--            <div :class="$parent.$parent.style">-->
-<!--              <label class="font_normal_body">表册类型</label>-->
-<!--              <v-select :value.sync="model.f_check_book_type" v-model='model.f_check_book_type'-->
-<!--                        :value-single="true" style="width: 60%"-->
-<!--                        class="select_list select"-->
-<!--                        :options='$parent.$parent.bookTypes' placeholder='表册类型'-->
-<!--                        close-on-select-->
-<!--                        condition="tcb.f_check_book_type ='{}'"></v-select>-->
-<!--            </div>-->
-<!--            <div :class="$parent.$parent.style">-->
-<!--              <label class="font_normal_body">用户类型</label>-->
-<!--              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'-->
-<!--                        :value-single="true" style="width: 60%"-->
-<!--                        class="select_list select"-->
-<!--                        :options='$parent.$parent.userTypes' placeholder='用户类型'-->
-<!--                        close-on-select-->
-<!--                        condition="tcb.f_user_type ='{}'"></v-select>-->
-<!--            </div>-->
+            <!--            <div :class="$parent.$parent.style">-->
+            <!--              <label class="font_normal_body">表册类型</label>-->
+            <!--              <v-select :value.sync="model.f_check_book_type" v-model='model.f_check_book_type'-->
+            <!--                        :value-single="true" style="width: 60%"-->
+            <!--                        class="select_list select"-->
+            <!--                        :options='$parent.$parent.bookTypes' placeholder='表册类型'-->
+            <!--                        close-on-select-->
+            <!--                        condition="tcb.f_check_book_type ='{}'"></v-select>-->
+            <!--            </div>-->
+            <!--            <div :class="$parent.$parent.style">-->
+            <!--              <label class="font_normal_body">用户类型</label>-->
+            <!--              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'-->
+            <!--                        :value-single="true" style="width: 60%"-->
+            <!--                        class="select_list select"-->
+            <!--                        :options='$parent.$parent.userTypes' placeholder='用户类型'-->
+            <!--                        close-on-select-->
+            <!--                        condition="tcb.f_user_type ='{}'"></v-select>-->
+            <!--            </div>-->
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
-              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增片区</button>
-              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">片区用户管理</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增安检册</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">安检册用户管理</button>
               <div style="float: right" class="button_spacing"
                    v-show="$parent.$parent.$parent.showItem ||$parent.$parent.$parent.showItemUser"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItemAll,'button_shrink_right':!$parent.$parent.$parent.showItemAll}"
                    @click="($parent.$parent.$parent.showItem =false) || ($parent.$parent.$parent.showItemUser =false)"></div>
-              </div>
+            </div>
 
 
           </div>
@@ -69,26 +69,26 @@
               </role-selector-safe>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">片区名</label>
+              <label class="font_normal_body">安检册名</label>
               <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
                         :value-single="true" style="width: 60%"
                         class="select_list select"
-                        :options='$parent.$parent.checkBooks' placeholder='片区名称'
+                        :options='$parent.$parent.checkBooks' placeholder='安检册名称'
                         close-on-select
                         condition="tcb.id ='{}'"></v-select>
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
-              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增片区</button>
-              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">片区用户管理</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增安检册</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">安检册用户管理</button>
               <div style="float: right" class="button_spacing"
                    v-show="$parent.$parent.$parent.showItem ||$parent.$parent.$parent.showItemUser"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItemAll,'button_shrink_right':!$parent.$parent.$parent.showItemAll}"
                    @click="($parent.$parent.$parent.showItem =false) || ($parent.$parent.$parent.showItemUser =false)"></div>
-<!--              <div style="float: right" class="button_spacing"-->
-<!--                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
-<!--                   @click="$parent.$parent.hidden()">-->
-<!--              </div>-->
+              <!--              <div style="float: right" class="button_spacing"-->
+              <!--                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
+              <!--                   @click="$parent.$parent.hidden()">-->
+              <!--              </div>-->
             </div>
 
           </div>
@@ -102,11 +102,11 @@
               <nobr>所属安检员</nobr>
             </th>
             <th>
-              <nobr>片区名称</nobr>
+              <nobr>安检册名称</nobr>
             </th>
-<!--            <th>-->
-<!--              <nobr>片区类型</nobr>-->
-<!--            </th>-->
+            <!--            <th>-->
+            <!--              <nobr>安检册类型</nobr>-->
+            <!--            </th>-->
             <th>
               <nobr>用户类型</nobr>
             </th>
@@ -116,15 +116,8 @@
             <th>
               <nobr>创建人</nobr>
             </th>
-
-            <th>
-              <nobr>执行日期</nobr>
-            </th>
-            <th>
-              <nobr>执行周期</nobr>
-            </th>
             <th>
-              <nobr>小区/单位数量</nobr>
+              <nobr>用户数量</nobr>
             </th>
             <th>
               <nobr>已下发</nobr>
@@ -132,38 +125,36 @@
             <th>
               <nobr>未下发</nobr>
             </th>
-            <th>
+<!--            <th>
               <nobr>已检</nobr>
             </th>
             <th>
               <nobr>未检</nobr>
-            </th>
-<!--            <th v-show="$parent.$parent.$parent.showCaoZuo">-->
-<!--              <nobr>操作</nobr>-->
-<!--            </th>-->
+            </th>-->
+            <!--            <th v-show="$parent.$parent.$parent.showCaoZuo">-->
+            <!--              <nobr>操作</nobr>-->
+            <!--            </th>-->
           </tr>
         </template>
         <template partial='body'>
           <td  style="text-align: center;">{{ row.f_checker_name }}</td>
           <td  style="text-align: center;">{{ row.f_check_book_name }}</td>
-<!--          <td  style="text-align: center;">{{ row.f_check_book_type }}</td>-->
+          <!--          <td  style="text-align: center;">{{ row.f_check_book_type }}</td>-->
           <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;">{{ row.f_run_date }}</td>
-          <td  style="text-align: center;">{{ row.f_around_time }}{{ row.f_around_unit }}</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.num}}</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>
-          <td  style="text-align: center;">{{ row.weijian }}</td>
-<!--          <td  v-show="row.f_check_book_type!='小区'" style="text-align: center;"><button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.send(row)'>下发</button></td>-->
+<!--          <td  style="text-align: center;">{{ row.yijian }}</td>
+          <td  style="text-align: center;">{{ row.weijian }}</td>-->
+          <!--          <td  v-show="row.f_check_book_type!='小区'" style="text-align: center;"><button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.send(row)'>下发</button></td>-->
         </template>
       </data-grid>
     </criteria-paged>
     <modal :show.sync="showModal" :backdrop="false" id="checkbookEntryShow">
       <article slot="modal-body" class="modal-body">
-        <check-book-entry v-if="showModal" @select-changed="selectedEntry"></check-book-entry>
+        <check-book-entry v-if="showModal" @select-changed="selectedEntry" :showtype="showtype"></check-book-entry>
       </article>
       <footer slot="modal-footer">
       </footer>
@@ -278,10 +269,10 @@ export default {
       }, {resolveMsg: null, rejectMsg: null}).then(res => {
         this.checkBooks.push({label: '全部', value: ''})
         res.data.forEach(ress => {
-            this.checkBooks.push({
-              label: ress.f_check_book_name,
-              value: ress.id
-            })
+          this.checkBooks.push({
+            label: ress.f_check_book_name,
+            value: ress.id
+          })
         })
       })
     },
@@ -298,12 +289,12 @@ export default {
       //tag
       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('修改成功')
-            this.showModal = false
-            this.checkBook= {}
-          }
+        {resolveMsg: '更新安检册信息成功', rejectMsg: '保存安检册信息成功'}).then(res=>{
+        if (res.data.code===200){
+          this.$showMessage('修改成功')
+          this.showModal = false
+          this.checkBook= {}
+        }
       })
     },
     cancel () {
@@ -318,9 +309,7 @@ export default {
       // //tag
       this.$parent.showItem = false
       this.$parent.showItemUser = false
-      if(this.model.f_filialeids){
-        args.condition += ` and f_orgid in ${this.model.f_filialeids}`
-      }
+      args.condition += ` and f_orgid in ${this.model.f_filialeids}`
       args.condition += ` and tcb.f_user_type ='${this.showtype}' `
       return this.model.search(args.condition, args.model)
     },
@@ -334,9 +323,9 @@ export default {
         let upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${val.id}'`
         let delCheckBook= `delete from t_check_book where id ='${val.id}'`
         await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upAddress}},
-          {resolveMsg: null, rejectMsg: '删除片区失败'})
+          {resolveMsg: null, rejectMsg: '删除安检册失败'})
         await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delCheckBook}},
-          {resolveMsg: null, rejectMsg: '删除片区失败'})
+          {resolveMsg: null, rejectMsg: '删除安检册失败'})
         this.$showMessage('删除成功')
         this.$refs.paged.$refs.criteria.search()
       }catch (e) {

package/src/components/pc/CheckBookSearchArea.vue

@@ -21,7 +21,7 @@
                           :value-single="true" style="width: 60%"
                           class="select_list select"
                           @change="$parent.$parent.changeState"
-                          :options='$parent.$parent.isCheckBook' placeholder='有无所属片区'
+                          :options='$parent.$parent.isCheckBook' placeholder='有无所属安检册'
                           close-on-select
                           condition="{}"></v-select>
               </div>
@@ -45,22 +45,19 @@
                 <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookAll"></input>全选</nobr>
               </th>
               <th>
-                <nobr>省/市/区</nobr>
+                <nobr>区/县</nobr>
               </th>
               <th>
-                <nobr>街道</nobr>
+                <nobr>街道/乡镇</nobr>
               </th>
               <th>
-                <nobr>片区/管理站</nobr>
+                <nobr>片区/行政村</nobr>
               </th>
               <th>
-                <nobr>小区（单位）名称</nobr>
+                <nobr>小区/自然村</nobr>
               </th>
               <th>
-                <nobr>小区（单位）地址</nobr>
-              </th>
-              <th>
-                <nobr>所属片区</nobr>
+                <nobr>所属安检册</nobr>
               </th>
             </tr>
           </template>
@@ -72,9 +69,8 @@
             </td>
             <td style="text-align: center">{{ row.f_pcd }}</td>
             <td style="text-align: center">{{ row.f_street }}</td>
-            <td style="text-align: center">{{ row.f_slice_area }}</td>
+            <td style="text-align: center">{{ row.f_community_name }}</td>
             <td style="text-align: center">{{ row.f_residential_area }}</td>
-            <td style="text-align: center">{{ row.f_area_address }}</td>
             <td style="text-align: center">{{ row.f_check_book_name }}</td>
           </template>
         </data-grid>
@@ -83,7 +79,7 @@
     <modal :show.sync="showModal" :backdrop="false">
       <div slot="modal-header" class="modal-header">
         <h4 class="modal-title">
-          创建片区
+          创建安检册
         </h4>
       </div>
       <div slot="modal-body" class="modal-body">
@@ -100,7 +96,7 @@
               </role-selector-safe>
             </div>
             <div class="form-group col-sm-6"  style="margin-top: 20px">
-              <label class="font_normal_body">片区名</label>
+              <label class="font_normal_body">安检册名</label>
               <input type="text" class="input_search" v-model="checkBook.f_check_book_name"
                      style="width: 60%"  >
             </div>
@@ -195,11 +191,11 @@ import * as Util from '../../components/Util'
 import bus from "../../bus";
 
 export default {
-  title: '片区管理',
+  title: '安检册管理',
   data () {
     let model = new PagedList('api/af-safecheck/sql/safe_singleTable_OrderBy', 20,{
-        items: "'ta.*,tcb.f_check_book_name'",
-        tablename: "'t_area ta left join t_check_book tcb on ta.f_check_book_id=tcb.id'",
+        items: "'ta.f_residential_area,ta.id,tcb.f_check_book_name,tcm.f_community_name,tcm.f_street'",
+        tablename: "'t_area ta left join t_check_book tcb on ta.f_check_book_id=tcb.id left join t_community tcm on ta.f_community_id = tcm.id'",
         orderitem: "'id desc'"
       })
     return {
@@ -262,7 +258,7 @@ export default {
   methods: {
     async ok2() {
       if (!this.selectBook) {
-        this.$showMessage('请选择片区')
+        this.$showMessage('请选择安检册')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -299,7 +295,7 @@ export default {
     },
     async ok3() {
       if (!this.selectBook) {
-        this.$showMessage('请选择片区')
+        this.$showMessage('请选择安检册')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -350,7 +346,7 @@ export default {
     },
     addUser () {
       if (!this.isCreateBook) {
-        this.$showMessage('请选择查询未划分片区的用户')
+        this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -362,7 +358,7 @@ export default {
     },
     upUser () {
       if (!this.isChangeBook) {
-        this.$showMessage('请选择查询已划分片区的用户')
+        this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -374,7 +370,7 @@ export default {
     },
     async delUser () {
       if (!this.isChangeBook) {
-        this.$showMessage('请选择查询已划分片区的用户')
+        this.$showMessage('请选择查询已划分安检册的用户')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
@@ -400,8 +396,8 @@ export default {
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
         await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delUser}},
-          {resolveMsg: null, rejectMsg: '删除片区失败'})
-        this.$showMessage('从片区删除所选用户成功')
+          {resolveMsg: null, rejectMsg: '删除安检册失败'})
+        this.$showMessage('从安检册删除所选用户成功')
         this.selectBook = ''
         this.bookAll = false
         this.bookList = []
@@ -413,7 +409,7 @@ export default {
     },
     beforeCreateBook () {
       if (!this.isCreateBook) {
-        this.$showMessage('请选择查询未划分片区的用户')
+        this.$showMessage('请选择查询未划分安检册的用户')
         return
       }
       if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {