safecheck-client 3.0.30-62 → 3.0.30-62-t4

package/src/filiale/yangchunboneng/pc/CheckBookSearchUser.vue

@@ -5,22 +5,17 @@
         <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_address"
-                       style="width: 60%" placeholder="地址" condition="f_address 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}"
@@ -28,17 +23,17 @@
               </div>
             </div>
             <div class="row">
-              <div class="form-group col-sm-3" v-show="$parent.$parent.criteriaShow">
+              <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-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="f_address like '%{}%'">
-              </div>
-              <div class="form-group col-sm-3" 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_user_type" v-model='model.f_user_type'
                           :value-single="true" style="width: 60%"
@@ -47,23 +42,20 @@
                           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="ui.f_orgid in {}"></right-tree-safe>
               </div>
-            </div>
-            <div class="row">
-              <div class="form-group col-sm-3"  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='安检册名称'
                           close-on-select
                           condition="f_check_book_id ='{}'"></v-select>
-
               </div>
-              <div class="form-group col-sm-3"  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%"
@@ -74,6 +66,65 @@
                           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>
@@ -100,6 +151,9 @@
               <th>
                 <nobr>客户地址</nobr>
               </th>
+              <th>
+                <nobr>首次通气时间</nobr>
+              </th>
               <th>
                 <nobr>所属安检册</nobr>
               </th>
@@ -117,6 +171,7 @@
             <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>
@@ -238,7 +293,7 @@ import bus from "../../../bus";
 export default {
   title: '片区管理',
   data () {
-    let model = new PagedList('rs/sql/getUserByCheckBookuser', 20)
+    let model = new PagedList('api/af-safecheck/sql/getUserByCheckBookuser', 20)
     return {
       model: model,
       criteriaShow: false,
@@ -247,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,
@@ -322,7 +378,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-       await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: addUser}},
+       await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: addUser}},
          {resolveMsg: null, rejectMsg: '添加用户失败'})
        this.$showMessage('添加用户成功')
        this.selectBook = ''
@@ -359,7 +415,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: upUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upUser}},
           {resolveMsg: null, rejectMsg: '调整用户失败'})
         this.$showMessage('调整用户成功')
         this.selectBook = ''
@@ -434,7 +490,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: delUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delUser}},
           {resolveMsg: null, rejectMsg: '删除片区失败'})
         this.$showMessage('从片区删除所选用户成功')
         this.selectBook = ''
@@ -486,7 +542,7 @@ export default {
         checkBook: this.checkBook,
         sqlStr: condition
       }
-      new HttpResetClass().load('post', 'rs/logic/AddCheckBook', {data}).then(res => {
+      new HttpResetClass().load('post', 'api/af-safecheck/logic/AddCheckBook', {data}).then(res => {
         //tag)
         if (res.data.id) {
           this.$showMessage('创建成功')
@@ -555,7 +611,7 @@ export default {
     },
     freshCheckBook () {
       this.checkBooks = []
-      new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: 'id,f_check_book_name,f_check_book_type',
           tablename: 't_check_book',
@@ -582,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()
   }
 }