safecheck-client 3.0.33-113 → 3.0.33-115

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

@@ -28,11 +28,11 @@
                         placeholder='小区'
                         class="select select_list"
                         :value.sync="model.f_residential_area"
-                        :value-single="true"
                         :options='$parent.$parent.residentialareas'
+                        :multiple='true'
                         v-model="model.f_residential_area"
-                        condition="f_residential_area = '{}'"
-                        close-on-select clear-button></v-select>
+                        condition="f_residential_area in {}"
+                        ></v-select>
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">地&emsp;&emsp;址</label>
@@ -202,7 +202,7 @@
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
                 v-model="model.f_gas_start"
-                condition="f_gas_date  >= '{}'"
+                condition="f_uservent_date  >= '{}'"
               >
               </datepicker>
             </div>
@@ -215,7 +215,7 @@
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
-                condition="f_gas_date  <= '{}'"
+                condition="f_uservent_date  <= '{}'"
                 v-model="model.f_gas_end">
               </datepicker>
             </div>
@@ -247,33 +247,16 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">通气开始</label>
-              <datepicker
-                :value.sync="model.f_gas_start"
-                placeholder='开始时间' style="width: 60%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM-dd'"
-                :show-rest-button="reset"
-                v-model="model.f_gas_start"
-                condition="f_gas_date > ='{} 00:00:00'">
-              </datepicker>
-            </div>
-            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">通气结束</label>
-              <datepicker
-                :value.sync="model.f_gas_end"
-                placeholder='结束时间' style="width: 60%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM-dd'"
-                :show-rest-button="reset"
-                v-model="model.f_gas_end"
-                condition="f_gas_date <=  '{} 23:59:59'">
-              </datepicker>
-            </div>
-            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">安检册</label>
-              <input style="width: 60%" type="text" class="input_search" v-model="model.f_check_book_name" id="f_check_book_name"
-                     placeholder="安检册" condition="f_check_book_name like '%{}%'">
+              <label class="font_normal_body">安&ensp;检&ensp;册</label>
+              <v-select id="f_check_book_name"
+                        placeholder='安检册'
+                        class="select select_list"
+                        :value.sync="model.f_check_book_name"
+                        :options='$parent.$parent.checkbooknames'
+                        :multiple='true'
+                        v-model="model.f_check_book_name"
+                        condition="f_check_book_name in {}"
+              ></v-select>
             </div>
           </div>
 
@@ -307,12 +290,6 @@
 
           </div>
           <div class="row" v-show="$parent.$parent.$parent.showItem">
-            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input style="width: 60%" type="text" class="input_search" v-model="model.f_residential_area"
-
-                     placeholder="小区" condition="f_residential_area like '%{}%'">
-            </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
               <label class="font_normal_body">地&emsp;&emsp;址</label>
               <input style="width: 60%" type="text" class="input_search" v-model="model.f_address"
@@ -406,7 +383,7 @@
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
                 v-model="model.f_gas_start"
-                condition="f_defect_content  >= '{}'"
+                condition="f_uservent_date  >= '{}'"
               >
               </datepicker>
             </div>
@@ -419,7 +396,7 @@
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
-                condition="f_gas_date  <= '{}'"
+                condition="f_uservent_date  <= '{}'"
                 v-model="model.f_gas_end">
               </datepicker>
             </div>
@@ -546,7 +523,7 @@
             {{row.f_last_check_state!='入户' ? '': (row.f_last_check_result == '无隐患' ? '无问题' : row.f_last_check_result) }}
           </td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_createfile_date }}</td>
-          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gas_date }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_uservent_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center" v-show="$parent.$parent.$parent.showcode">
             <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.searchInfo(row.f_userinfo_code)' >点击</button>
           </td>
@@ -628,7 +605,7 @@ export default {
         'f_last_check_state': '安检状态',
         'f_last_check_result': '安检结果',
         'f_createfile_date': '建档日期',
-        'f_gas_date': '通气日期'
+        'f_uservent_date': '通气日期'
       },
       model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",
@@ -673,6 +650,7 @@ export default {
       creatPlanWay: '',
       sliceArea: [],
       residentialareas: [],
+      checkbooknames: [],
       cbcs:[],
       cbc:[],
       pcds:[]
@@ -707,6 +685,7 @@ export default {
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
     this.getresidentialarea()
+    this.getcheckbookname()
   },
   methods: {
     //查询二维码
@@ -811,6 +790,27 @@ export default {
 
         })
     },
+    getcheckbookname(){
+      new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_GroupBy`, {data: {
+          items: 'f_check_book_name',
+          tablename: 't_check_book',
+          condition: ` f_orgid = '${this.$login.f.orgid}'`,
+          groupitem: 'f_check_book_name',
+        }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.checkbooknames=[]
+        this.checkbooknames.push({
+          label:'全部',
+          value:''
+        })
+        res.data.forEach(ress=>{
+          this.checkbooknames.push({
+            label:ress.f_check_book_name,
+            value:ress.f_check_book_name
+          })
+        })
+
+      })
+    },
     // 获取县域分公司内容
     getfengongsi() {
       let val = {

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('siyang')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck()
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})