safecheck-client 3.0.33-23 → 3.0.33-25

package/src/filiale/fugou/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/filiale/fugou/pc/CheckBookList.vue

@@ -117,7 +117,7 @@
               <nobr>创建人</nobr>
             </th>
             <th>
-              <nobr>小区/单位数量</nobr>
+              <nobr>用户数量</nobr>
             </th>
             <th>
               <nobr>已下发</nobr>
@@ -143,7 +143,7 @@
           <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;"><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.num2}}</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>

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

@@ -76,7 +76,7 @@
               <v-select :value.sync="model.f_check_book_num" v-model="model.f_check_book_num"
                         :options='$parent.$parent.meterbooks' placeholder='安检册'
                         :value-single="true"
-                        condition="f_check_book_num='{}'"
+                        condition="f_check_book_name='{}'"
                         style="width:60%"
                         close-on-select></v-select>
             </div>
@@ -194,6 +194,18 @@
                         close-on-select>
               </v-select>
             </div>
+            <div  class="col-sm-3 form-group">
+              <label class="font_normal_body">开户时间</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_open_date"
+                placeholder='开户时间' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :select-month="true"
+                v-model='model.f_open_date'
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>
@@ -294,7 +306,7 @@ export default {
       f_filialeid: this.$login.f.orgid,
       f_orgid: '',
       invoiceuse: [{label: '是', value: 'is not null'}, {label: '否', value: 'is null'}],
-      model: new PagedList('api/af-revenue/sql/mb_peopleList', 20),
+      model: new PagedList('rs/sql/mb_peopleList', 20),
       f_orgstr: this.$login.f.orgid,
       // 要操作的用户
       rowsdata: [],
@@ -419,6 +431,9 @@ export default {
       let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_orgid in ('" + this.f_orgid + "')"
       args.condition = `${args.condition} ` + f_orgstr
       // args.condition += ` and f_orgid = ${this.f_orgstr}`
+      if(args.model.f_open_date){
+        args.condition += ` and  f_open_date <='${args.model.f_open_date}' `
+      }
       this.condition = args.condition
       this.$parent.condition = this.condition
       this.model.search(args.condition, args.model)

package/src/filiale/fugou/pc/CheckBookUser.vue

@@ -4,36 +4,47 @@
       <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" >
+            <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='客户编号'
+              <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 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' >
+      <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>
+            <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>
+        <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>
@@ -48,49 +59,41 @@ import {PagedList} from 'vue-client'
 export default {
   title: '安检记录列表',
   props: ['row'],
-  data () {
+  data() {
     return {
       rowdata: this.row,
-      model: new PagedList('rs/sql/getUserByCheckBook', 50)
+      model: new PagedList('rs/sql/safe_singleTable_OrderBy', 50,
+        {
+          items: '"tua.f_address,tui.f_userinfo_code,tui.f_user_name,tui.f_user_phone"',
+          tablename: '"t_user_address tua left join t_userinfo tui on tua.f_userinfo_id = tui.f_userinfo_id"',
+          orderitem: '"tua.id desc"'
+        }
+      )
     }
   },
-  ready(){
-    if(this.row){
-      let condition=''
-      if(this.row.f_check_book_type1=='小区'){
-        this.model.url = 'rs/sql/getUserByCheckBook'
-        condition  = `ta.f_check_book_id =${this.row.f_check_book_id} and ta.id=${this.row.id}`
-      }else{
-        this.model.url = 'rs/sql/getUserByCheckBookCompany'
-        condition  = `tc.f_check_book_id =${this.row.f_check_book_id} and tc.id=${this.row.id}`
-      }
+  ready() {
+    if (this.row) {
+      let condition = ''
+      condition = `tua.f_check_book_id =${this.row.id}`
       this.model.search(condition)
       //只显示用户页面
-      this.row.f_check_book_type='用户'
+      this.row.f_check_book_type = '用户'
     }
   },
   watch: {
-    'row' (val) {
+    'row'(val) {
       if (val) {
         this.rowdata = val
-        let condition=''
-        if(this.row.f_check_book_type1=='小区'){
-          condition  = `ta.f_check_book_id =${val.f_check_book_id} and ta.id=${val.id}`
-        }else{
-          condition  = `tc.f_check_book_id =${val.f_check_book_id} and tc.id=${val.id}`
-        }
+        let condition = ''
+        condition = `tua.f_check_book_id =${val.id} `
         this.model.search(condition)
       }
     }
   },
   methods: {
-    selfSearch (args) {
+    selfSearch(args) {
       if (this.rowdata.id) {
-        if(this.rowdata.f_check_book_type1=='小区'){
-          args.condition += `and ta.f_check_book_id =${this.rowdata.f_check_book_id} and ta.id=${this.rowdata.id}`
-        }else{
-          args.condition += `and tc.f_check_book_id =${this.rowdata.f_check_book_id} and tc.id=${this.rowdata.id}`
-        }
+        args.condition += `and tua.f_check_book_id =${this.rowdata.id}`
         this.model.search(args.condition)
       } else {
         this.$showMessage('请选择片区')

package/src/filiale/fugou/pc/PlanManage.vue

@@ -412,7 +412,7 @@
               value-single>
             </v-select>
           </div>
-          <div class="form-group col-sm-4" v-if="$login.f.rolestr.includes('计划结束时间')==true">
+          <div class="form-group col-sm-4" >
             <label class="font_normal_body">结束时间:</label>
             <datepicker
               :value.sync="upCheckPlan.f_end_time"

package/src/filiale/fugou/pc/checkUserList.vue

@@ -28,7 +28,7 @@
                 :timeout="500"
                 @select-search="$parent.$parent.select_search"
                 placeholder='安检册筛选'
-                condition="f_check_book_id ='{}'"
+                condition="ua.f_check_book_id ='{}'"
                 close-on-select
                 value-single
               >

package/src/filiale/yongzhou/pc/CheckPlan.vue

@@ -1,59 +1,59 @@
-<template>
-  <div id="unit" class="flex-row" :class="{'binary':showItem}">
-<!--    <section>-->
-
-    <div  :class="{'basic-main':!showItem,'binary-left':showItem}" >
-          <select-check-plan @select-changed="selected" :style="style" :style2="style2" @checkstatus-changed="checkstatusChange" v-ref:check></select-check-plan>
-        </div>
-    <div  class="binary-right" v-show="showItem">
-      <div class="flex">
-          <check-detail v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected' :checkstatus="checkstatus" :checkstart="$refs.check.f_check_start" :checkend="$refs.check.f_check_end"
-                        v-ref:detail></check-detail>
-        </div>
-    </div>
-
-<!--    </section>-->
-  </div>
-</template>
-
-<script>
-    import SelectCheckPlan from './SelectCheckPlan'
-    import CheckDetail from './../../../components/checkplan/CheckDetail'
-
-    export default {
-        title: '安检员考核',
-        props: ['f'],
-        components: {SelectCheckPlan, CheckDetail},
-        data() {
-            return {
-                showItem: false,
-                checkstatus: null,
-              style:'col-sm-2 form-group',
-              style2:'col-sm-4 form-group'
-            }
-        },
-        methods: {
-          selected(row) {
-            // //tag
-            this.showItem = true
-          },
-          checkstatusChange(val){
-            this.checkstatus = val
-          }
-        }
-    }
-</script>
-<style>
-  .form-input-group label {
-    text-align: right;
-    width: auto;
-  }
-
-  .datapanel {
-    color: #333;
-    background-color: white;
-    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
-    padding: 5px 7px 5px 7px;
-    border-radius: 10px;
-  }
-</style>
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+<!--    <section>-->
+
+    <div  :class="{'basic-main':!showItem,'binary-left':showItem}" >
+          <select-check-plan @select-changed="selected" :style="style" :style2="style2" @checkstatus-changed="checkstatusChange" v-ref:check></select-check-plan>
+        </div>
+    <div  class="binary-right" v-show="showItem">
+      <div class="flex">
+          <check-detail v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected' :checkstatus="checkstatus" :checkstart="$refs.check.f_check_start" :checkend="$refs.check.f_check_end"
+                        v-ref:detail></check-detail>
+        </div>
+    </div>
+
+<!--    </section>-->
+  </div>
+</template>
+
+<script>
+    import SelectCheckPlan from './SelectCheckPlan'
+    import CheckDetail from './../../../components/checkplan/CheckDetail'
+
+    export default {
+        title: '安检员考核',
+        props: ['f'],
+        components: {SelectCheckPlan, CheckDetail},
+        data() {
+            return {
+                showItem: false,
+                checkstatus: null,
+              style:'col-sm-2 form-group',
+              style2:'col-sm-4 form-group'
+            }
+        },
+        methods: {
+          selected(row) {
+            // //tag
+            this.showItem = true
+          },
+          checkstatusChange(val){
+            this.checkstatus = val
+          }
+        }
+    }
+</script>
+<style>
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+    padding: 5px 7px 5px 7px;
+    border-radius: 10px;
+  }
+</style>