safecheck-client 4.0.0-7 → 4.0.0-71

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) {

package/src/components/pc/CheckBookSearchUser.vue

@@ -5,34 +5,35 @@
         <criteria partial='criteria' class="search_area" @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">
+              <div class="form-group col-sm-4">
                 <label class="font_normal_body">客户编号</label>
                 <input type="text" class="input_search" v-model="model.f_userinfo_code"
                        style="width: 60%" placeholder="客户编号" condition="f_userinfo_code='{}'">
               </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-4">
                 <label class="font_normal_body">客户名称</label>
                 <input type="text" class="input_search" v-model="model.f_user_name"
                        style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
               </div>
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">用户单位</label>
-                <input type="text" class="input_search" v-model="model.f_residential_area"
-                       style="width: 60%" placeholder="用户单位" condition="f_residential_area like '%{}%'">
-              </div>
-              <div class="form-group col-sm-3">
+              <div class="form-group col-sm-4">
                 <button class="button_spacing button_search" @click="search()">查询</button>
                 <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 class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">-->
-<!--                <label class="font_normal_body">客户地址</label>-->
-<!--                <input type="text" class="input_search" v-model="model.f_address"-->
-<!--                       style="width: 60%" placeholder="客户地址" condition="tua.f_address like '%{}%'">-->
-<!--              </div>-->
-              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
+            </div>
+            <div class="row">
+              <div class="form-group col-sm-4" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">地&emsp;&emsp;址</label>
+                <input type="text" class="input_search" v-model="model.f_address"
+                       style="width: 60%" placeholder="地址" condition="f_address like '%{}%'">
+              </div>
+              <div class="form-group col-sm-4" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">小区名称</label>
+                <input type="text" class="input_search" v-model="model.f_residential_area"
+                       style="width: 60%" placeholder="小区名称" condition="f_residential_area like '%{}%'">
+              </div>
+              <div class="form-group col-sm-4" v-show="$parent.$parent.criteriaShow">
                 <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%"
@@ -41,40 +42,97 @@
                           close-on-select
                           condition="f_user_type ='{}'"></v-select>
               </div>
-              <div class="col-sm-3 form-group" style="margin-bottom: 0px" v-show="$parent.$parent.criteriaShow">
+              <div class="col-sm-4 form-group" style="margin-bottom: 0px" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">公&emsp;&emsp;司</label>
-                <right-tree-safe  @re-res="$parent.$parent.getResm" v-model="model.f_orgid" condition="f_orgid in {}"></right-tree-safe>
+                <right-tree-safe  @re-res="$parent.$parent.getResm" v-model="model.f_orgid" condition="ui.f_orgid in {}"></right-tree-safe>
               </div>
-              <div class="col-sm-3 form-group"  v-show="$parent.$parent.criteriaShow">
-
-                <label class="font_normal_body">片区名称</label>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">安&ensp;检&ensp;册</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="f_check_book_id ='{}'"></v-select>
-
               </div>
-              <div class="col-sm-3 form-group"   v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">是否在册</label>
                 <v-select :value.sync="model.f_is_checkbook" v-model='model.f_is_checkbook'
                           :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>
             </div>
+            <div class="row">
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">首次通气开始</label>
+                <datepicker
+                  :value.sync="model.f_gas_date_str"
+                  style="width: 60%"
+                  placeholder='首次通气开始日期'
+                  :format="'yyyy-MM-dd 00:00:00'"
+                  v-model="model.f_gas_date_str"
+                  condition="f_uservent_date > '{}'"
+                >
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">首次通气结束</label>
+                <datepicker
+                  :value.sync="model.f_gas_date_end"
+                  style="width: 60%"
+                  placeholder='首次通气结束日期'
+                  :format="'yyyy-MM-dd 23:59:59'"
+                  v-model="model.f_gas_date_end"
+                  condition="f_uservent_date < '{}'"
+                >
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">表具通气开始</label>
+                <datepicker
+                  :value.sync="model.f_check_start"
+                  placeholder='表具通气开始时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_start"
+                  condition="f_gas_date > ='{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">表具通气结束</label>
+                <datepicker
+                  :value.sync="model.f_check_end"
+                  placeholder='表具通气结束时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_end"
+                  condition="f_gas_date <=  '{} 23:59:59'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">用户状态</label>
+                <v-select :value.sync="model.f_user_state" v-model='model.f_user_state'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.userstates'
+                          close-on-select
+                          condition="f_user_state = '{}'"></v-select>
+              </div>
+            </div>
           </div>
         </criteria>
         <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
           <template partial='head'>
             <tr @dblclick.stop="">
-<!--              <th>-->
-<!--                <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookAll"></input>全选</nobr>-->
-<!--              </th>-->
+              <th>
+                <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookAll"></input>全选</nobr>
+              </th>
               <th>
                 <nobr>客户姓名</nobr>
               </th>
@@ -94,22 +152,26 @@
                 <nobr>客户地址</nobr>
               </th>
               <th>
-                <nobr>所属片区</nobr>
+                <nobr>首次通气时间</nobr>
+              </th>
+              <th>
+                <nobr>所属安检册</nobr>
               </th>
             </tr>
           </template>
           <template partial='body'>
-<!--            <td style="text-align: center">-->
-<!--              <nobr><input type="checkbox" :checked="$parent.$parent.$parent.checkModel(row)"-->
-<!--                           @change="$parent.$parent.$parent.checkChange(row, $event)"></input>-->
-<!--              </nobr>-->
-<!--            </td>-->
+            <td style="text-align: center">
+              <nobr><input type="checkbox" :checked="$parent.$parent.$parent.checkModel(row)"
+                           @change="$parent.$parent.$parent.checkChange(row, $event)"></input>
+              </nobr>
+            </td>
             <td style="text-align: center">{{ row.f_user_name }}</td>
             <td style="text-align: center">{{ row.f_userinfo_code }}</td>
             <td style="text-align: center">{{ row.f_user_type }}</td>
             <td style="text-align: center">{{ row.f_user_phone }}</td>
             <td style="text-align: center">{{ row.f_residential_area }}</td>
             <td style="text-align: center">{{ row.f_address }}</td>
+            <td style="text-align: center">{{ row.f_uservent_date }}</td>
             <td style="text-align: center">{{ row.f_check_book_name }}</td>
           </template>
         </data-grid>
@@ -124,10 +186,6 @@
       <div slot="modal-body" class="modal-body">
         <div v-if="true">
           <div class="row" style="margin-top: 10px">
-<!--            <label class="control-label font text-left" style="float:left;margin-left:10%;margin-top:5px">片区名称</label>-->
-<!--            <div class="col-xs-8 col-md-8">-->
-<!--              <input type="text" class="input_search" style="width: 70%;" v-model="checkBook.f_check_book_name"/>-->
-<!--            </div>-->
             <div class="col-sm-12 form-group"  style="margin: 0">
               <role-selector-safe
                 @re-res="getRes"
@@ -146,10 +204,10 @@
               <label class="font_normal_body">执行日期</label>
               <datepicker
                 :value.sync="checkBook.f_run_date"
-                 style="width: 60%"
+                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">
@@ -244,6 +302,7 @@ export default {
       f_orgid: '',
       bookAll: false,
       bookList: [],
+      userstates:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')],
       selectBook:'',
       userTypes: [{label: '全部', value: ''},{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
       // init:false,
@@ -287,29 +346,29 @@ export default {
       if(!val){
         this.bookList=[]
       }
-
-      this.$emit('book-all',this.bookAll)
+      this.bookList=[]
+      for (let row of this.model.rows){
+        this.bookList.push({f_userinfo_id:row.f_userinfo_id,f_plan_id:row.f_plan_id})
+      }
+      // this.$emit('book-all',this.bookAll)
     }
   },
   methods: {
-   async ok2() {
-     if (!this.selectBook) {
-       this.$showMessage('请选择片区')
-       return
-     }
-     if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
-       let userCondition = ''
-       if (this.bookList.length < 1) {
-         //tag
-         userCondition = this.bookCondition
-       } else {
-         //tag)
-
-         userCondition = JSON.stringify(this.bookList).substring(JSON.stringify(this.bookList).indexOf('[') + 1, JSON.stringify(this.bookList).indexOf(']'))
-         userCondition = 'tui.f_userinfo_id in (' + userCondition + ')'
-         //tag
-       }
-       let addUser = `update t_user_address set f_check_book_id ='${this.selectBook}'
+    async ok2() {
+      if (!this.selectBook) {
+        this.$showMessage('请选择片区')
+        return
+      }
+      if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
+        let userCondition = ''
+        if (this.bookList.length < 1) {
+          //tag
+          userCondition = this.bookCondition
+        } else {
+          userCondition = JSON.stringify(this.bookList).substring(JSON.stringify(this.bookList).indexOf('[') + 1, JSON.stringify(this.bookList).indexOf(']'))
+          userCondition = 'tui.f_userinfo_id in (' + userCondition + ')'
+        }
+        let addUser = `update t_user_address set f_check_book_id ='${this.selectBook}'
         FROM
             t_userinfo tui
                 LEFT JOIN t_userfiles tuf ON tui.f_userinfo_id= tuf.f_userinfo_id
@@ -319,16 +378,16 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-       await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: addUser}},
-         {resolveMsg: null, rejectMsg: '添加用户失败'})
-       this.$showMessage('添加用户成功')
-       this.selectBook = ''
-       this.bookAll = false
-       this.bookList = []
-       this.showModal2 = false
-       this.$refs.paged.$refs.criteria.search()
-     }
-   },
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: addUser}},
+          {resolveMsg: null, rejectMsg: '添加用户失败'})
+        this.$showMessage('添加用户成功')
+        this.selectBook = ''
+        this.bookAll = false
+        this.bookList = []
+        this.showModal2 = false
+        this.$refs.paged.$refs.criteria.search()
+      }
+    },
     async ok3() {
       if (!this.selectBook) {
         this.$showMessage('请选择片区')
@@ -513,10 +572,8 @@ export default {
     },
     checkModel (row) {
       if (this.bookAll) {
-        //tag)
         return true
       } else {
-        // this.bookList = []
         if (this.bookList.findIndex(res => res === row.f_userinfo_id) !== -1) {
           return true
         } else {
@@ -525,13 +582,11 @@ export default {
       }
     },
     checkChange (row, e) {
-      //tag
       if (e.target.checked) {
-        this.bookList.push(row.f_userinfo_id)
+        this.bookList.push({f_userinfo_id:row.f_userinfo_id,f_plan_id:row.f_plan_id})
       } else {
-        this.bookList.splice(this.bookList.findIndex(res => res === row.f_userinfo_id), 1)
+        this.bookList.splice(this.bookList.findIndex(res => res.f_userinfo_id === row.f_userinfo_id), 1)
       }
-      // //tag)
     },
     getRes (obj) {
       this.checkBook.f_orgid = obj.resids[0]
@@ -583,15 +638,15 @@ export default {
     bus.$off('fresh-user')
   },
   ready () {
-    bus.$on('fresh-user',()=>{
-      console.log("进入方法")
-      this.bookAll = false
-      this.bookList = []
-      this.$refs.paged.$refs.criteria.search()
-    })
-    this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
-    //tag
-    // this.init=true
+    // bus.$on('fresh-user',()=>{
+    //   console.log("进入方法")
+    //   this.bookAll = false
+    //   this.bookList = []
+    //   this.$refs.paged.$refs.criteria.search()
+    // })
+    // this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
+    // //tag
+    // // this.init=true
     this.freshCheckBook()
   }
 }

package/src/components/pc/CheckBookSearchUserList.vue

@@ -147,7 +147,7 @@
               <div slot="modal-body" class="modal-body">
                 <div class="row">
                   <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
-                               action="rs/file/uploadFile" tagname="档案信息导入" v-ref:file :headers="headers" multiple></file-upload>
+                               action="api/af-safecheck/file/uploadFile" tagname="档案信息导入" v-ref:file :headers="headers" multiple></file-upload>
                   <img src="../../assets/Excelformat.png" style="width: 100%"/>
                 </div>
               </div>
@@ -263,7 +263,6 @@
 import {HttpResetClass, PagedList} from "vue-client";
 import * as Util from "../../components/Util";
 import Vue from "vue";
-import {toStandardDateString} from "../../components/Util";
 
 export default {
   title: '计划管理',