safecheck-client 3.0.30-gongyi → 3.0.33-gongyi

package/src/components/notice/NoticeForm.vue

@@ -1,100 +1,100 @@
-<template>
-<div>
-    <validator name='v'>
-        <form novalidate class="form-horizontal">
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">标题：</label>
-                <div class="col-sm-8">
-                    <input class="form-control" type="text" v-model="notice.f_title" v-validate:f_title='{ required: true }' />
-                </div>
-              </div>
-              <div class="form-group">
-                <label class="col-sm-2 control-lable">内容：</label>
-                <div class="col-sm-8">
-                    <textarea class="form-control" type="text" v-model="notice.f_content" v-validate:f_content='{ required: true }'></textarea>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">时间：</label>
-                <div class="col-sm-8">
-                    <input readonly='readonly' class="form-control" type="text" v-model="notice.f_time"/>
-                </div>
-            </div>
-            <div class="form-group">
-              <label class="col-sm-2 control-lable">分公司：</label>
-              <div class="col-sm-8">
-                <v-select :value.sync="notice.f_subcompany" :options='$parent.$refs.query.f_divisions' placeholder='请选择子公司'
-                  close-on-select clear-button></v-select>
-              </div>
-            </div>
-            <div class="form-group col-sm-10 text-right">
-              <button type="button" class="btn btn-success width-80" @click="save" v-if="$v.valid">保存</button>
-              <button type="button" class="btn btn-success width-80" @click="anew">新建</button>
-              <button type="button" class="btn btn-success width-80" @click="delete" v-if="$v.valid">删除</button>
-            </div>
-        </form>
-    </validator>
-</div>
-
-</template>
-
-<script>
-import * as Util from '../Util'
-import co from 'co'
-import Vue from 'vue'
-
-let syncSave = function * (self) {
-  self.notice.f_subcompany = self.$parent.$refs.query.f_divisions[0].value
-  yield self.$resetpost('rs/entity/t_notice', self.notice)
-  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
-}
-
-let syncDelete = function * (self) {
-  yield self.$remove('rs/entity/t_notice/', {id:self.notice.id })
-  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
-}
-
-export default {
-  title: '公告表单',
-  props: ['notice'],
-  computed: {
-    f_division: {
-      get() {
-        if (!this.notice || !this.notice.f_subcompany)
-          return Vue.f_subcompany
-        else
-          return [this.notice.f_subcompany]
-      },
-      set(val) {
-        this.notice.f_subcompany = val[0]
-      }
-    }
-  },
-  methods: {
-    save() {
-      if (!this.notice) {
-        alert('请选择一个通知。')
-        return
-      }
-      if (!this.notice.id) {
-        this.$set('notice.f_time', Util.toStandardTimeString())
-      }
-      let gen = syncSave(this)
-      return co(gen)
-    },
-    anew() {
-      this.notice = {}
-      this.$set('notice.f_time', Util.toStandardTimeString())
-    },
-    delete() {
-      if (!this.notice) {
-        alert('请选择一个通知。')
-        return
-      }
-      let gen = syncDelete(this)
-      return co(gen)
-    }
-  }
-}
-
-</script>
+<template>
+<div>
+    <validator name='v'>
+        <form novalidate class="form-horizontal">
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">标题：</label>
+                <div class="col-sm-8">
+                    <input class="form-control" type="text" v-model="notice.f_title" v-validate:f_title='{ required: true }' />
+                </div>
+              </div>
+              <div class="form-group">
+                <label class="col-sm-2 control-lable">内容：</label>
+                <div class="col-sm-8">
+                    <textarea class="form-control" type="text" v-model="notice.f_content" v-validate:f_content='{ required: true }'></textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">时间：</label>
+                <div class="col-sm-8">
+                    <input readonly='readonly' class="form-control" type="text" v-model="notice.f_time"/>
+                </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-2 control-lable">分公司：</label>
+              <div class="col-sm-8">
+                <v-select :value.sync="notice.f_subcompany" :options='$parent.$refs.query.f_divisions' placeholder='请选择子公司'
+                  close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="form-group col-sm-10 text-right">
+              <button type="button" class="btn btn-success width-80" @click="save" v-if="$v.valid">保存</button>
+              <button type="button" class="btn btn-success width-80" @click="anew">新建</button>
+              <button type="button" class="btn btn-success width-80" @click="delete" v-if="$v.valid">删除</button>
+            </div>
+        </form>
+    </validator>
+</div>
+
+</template>
+
+<script>
+import * as Util from '../Util'
+import co from 'co'
+import Vue from 'vue'
+
+let syncSave = function * (self) {
+  self.notice.f_subcompany = self.$parent.$refs.query.f_divisions[0].value
+  yield self.$resetpost('rs/entity/t_notice', self.notice)
+  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
+}
+
+let syncDelete = function * (self) {
+  yield self.$remove('rs/entity/t_notice/', {id:self.notice.id })
+  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
+}
+
+export default {
+  title: '公告表单',
+  props: ['notice'],
+  computed: {
+    f_division: {
+      get() {
+        if (!this.notice || !this.notice.f_subcompany)
+          return Vue.f_subcompany
+        else
+          return [this.notice.f_subcompany]
+      },
+      set(val) {
+        this.notice.f_subcompany = val[0]
+      }
+    }
+  },
+  methods: {
+    save() {
+      if (!this.notice) {
+        alert('请选择一个通知。')
+        return
+      }
+      if (!this.notice.id) {
+        this.$set('notice.f_time', Util.toStandardTimeString())
+      }
+      let gen = syncSave(this)
+      return co(gen)
+    },
+    anew() {
+      this.notice = {}
+      this.$set('notice.f_time', Util.toStandardTimeString())
+    },
+    delete() {
+      if (!this.notice) {
+        alert('请选择一个通知。')
+        return
+      }
+      let gen = syncDelete(this)
+      return co(gen)
+    }
+  }
+}
+
+</script>

package/src/components/notice/NoticeIssue.vue

@@ -1,20 +1,20 @@
-<template>
-  <div class="flex">
-    <section>
-      <div class="flex-row">
-        <div class="over col-md-6">
-          <notice-query v-ref:query></notice-query>
-        </div>
-        <div class="span-row over col-md-6">
-          <notice-form :notice='$refs.query.selected'></notice-form>
-        </div>
-      </div>
-    </section>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '通知管理'
-}
-</script>
+<template>
+  <div class="flex">
+    <section>
+      <div class="flex-row">
+        <div class="over col-md-6">
+          <notice-query v-ref:query></notice-query>
+        </div>
+        <div class="span-row over col-md-6">
+          <notice-form :notice='$refs.query.selected'></notice-form>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '通知管理'
+}
+</script>

package/src/components/notice/NoticeQuery.vue

@@ -1,76 +1,76 @@
-<template>
-<div>
-  <criteria-paged :model="model" v-ref:cp>
-    <criteria partial='criteria'  @condition-changed='search' v-ref:criteria>
-      <div novalidate partial>
-        <div class="row form-inline auto select-overspread">
-          <div class="form-group">
-            <input type="text"  id="f_title" class="form-control" v-model="model.f_title" v-on:keyup.enter="search"
-                    placeholder="标题" condition="f_title like '%{}%'" >
-          </div>
-          <div class="form-group">
-            <datepicker id="f_start"
-                        :value.sync="model.f_start"
-                        placeholder="开始时间"
-                        :disabled-days-of-Week="[]"
-                        :format="'yyyy-MM-dd'"
-                        v-model="model.f_start"  condition="f_time >= '{}'"> </datepicker>
-          </div>
-          <div class="form-group">
-            <datepicker id="f_end"
-                        :value.sync="model.f_end"
-                        placeholder="结束时间"
-                        :disabled-days-of-Week="[]"
-                        :format="'yyyy-MM-dd'"
-                        v-model="model.f_end"  condition=" f_time <= '{} 23:59:59'"> </datepicker>
-          </div>
-          <div class="form-group">
-            <v-select :value.sync="$parent.$parent.model.f_division" :options='$parent.$parent.f_divisions' placeholder='请选择子公司'
-                      close-on-select clear-button></v-select>
-          </div>
-          <div class="form-group">
-            <button type="button" class="btn btn-success width-80" @click="search()">查询</button>
-          </div>
-        </div>
-      </div>
-    </criteria>
-    <data-grid :model="model" partial='list' v-ref:grid>
-      <template partial='head'>
-        <tr>
-          <th>标    题</th>
-          <th>下发时间</th>
-          <th>分公司</th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <td>{{row.f_title}}</td>
-        <td>{{row.f_time}}</td>
-        <td>{{row.f_subcompany}}</td>
-      </template>
-    </data-grid>
-  </criteria-paged>
-</div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import Vue from 'vue'
-import AppData from '../../stores/AppData'
-
-export default {
-  title: '公告查询',
-  data () {
-    let model = new PagedList('rs/sql/公告查询', 20, {f_subcompany: 'this.f_division[0]'})
-    model.f_division = [this.$login.f.f_fengongsi]
-    return {
-      model: model,
-      f_divisions: this.$login.f.f_fengongsi != '' ? [{label: this.$login.f.f_fengongsi, value: this.$login.f.f_fengongsi}]: this.$appdata.getParam('安检系统用子公司')
-    }
-  },
-  computed: {
-    selected () {
-      return this.$refs.cp.$refs.grid.selected
-    }
-  }
-}
-</script>
+<template>
+<div>
+  <criteria-paged :model="model" v-ref:cp>
+    <criteria partial='criteria'  @condition-changed='search' v-ref:criteria>
+      <div novalidate partial>
+        <div class="row form-inline auto select-overspread">
+          <div class="form-group">
+            <input type="text"  id="f_title" class="form-control" v-model="model.f_title" v-on:keyup.enter="search"
+                    placeholder="标题" condition="f_title like '%{}%'" >
+          </div>
+          <div class="form-group">
+            <datepicker id="f_start"
+                        :value.sync="model.f_start"
+                        placeholder="开始时间"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd'"
+                        v-model="model.f_start"  condition="f_time >= '{}'"> </datepicker>
+          </div>
+          <div class="form-group">
+            <datepicker id="f_end"
+                        :value.sync="model.f_end"
+                        placeholder="结束时间"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd'"
+                        v-model="model.f_end"  condition=" f_time <= '{} 23:59:59'"> </datepicker>
+          </div>
+          <div class="form-group">
+            <v-select :value.sync="$parent.$parent.model.f_division" :options='$parent.$parent.f_divisions' placeholder='请选择子公司'
+                      close-on-select clear-button></v-select>
+          </div>
+          <div class="form-group">
+            <button type="button" class="btn btn-success width-80" @click="search()">查询</button>
+          </div>
+        </div>
+      </div>
+    </criteria>
+    <data-grid :model="model" partial='list' v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <th>标    题</th>
+          <th>下发时间</th>
+          <th>分公司</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td>{{row.f_title}}</td>
+        <td>{{row.f_time}}</td>
+        <td>{{row.f_subcompany}}</td>
+      </template>
+    </data-grid>
+  </criteria-paged>
+</div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+import AppData from '../../stores/AppData'
+
+export default {
+  title: '公告查询',
+  data () {
+    let model = new PagedList('rs/sql/公告查询', 20, {f_subcompany: 'this.f_division[0]'})
+    model.f_division = [this.$login.f.f_fengongsi]
+    return {
+      model: model,
+      f_divisions: this.$login.f.f_fengongsi != '' ? [{label: this.$login.f.f_fengongsi, value: this.$login.f.f_fengongsi}]: this.$appdata.getParam('安检系统用子公司')
+    }
+  },
+  computed: {
+    selected () {
+      return this.$refs.cp.$refs.grid.selected
+    }
+  }
+}
+</script>

package/src/components/paper/PaperList.vue

@@ -105,7 +105,18 @@
                         :value-single="true"
                         close-on-select clear-button></v-select>
             </div>
-
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">用户类型</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_user_type" v-model="model.f_user_type"
+                          :options='$parent.$parent.userTypes'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_user_type='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
 
 
          <!--            <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">-->
@@ -169,6 +180,43 @@
                           :value-single="true">
                 </v-select>
               </div>
+
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">气表类型</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.meter_classify" v-model="model.meter_classify"
+                          :options='$parent.$parent.meter_classifys'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="F_METER_CLASSIFY='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">安装位置</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_position" v-model="model.f_position"
+                          :options='$parent.$parent.positions'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_position='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">房屋类型</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_house_type" v-model="model.f_house_type"
+                          :options='$parent.$parent.housetype'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_house_type='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -363,10 +411,34 @@
           f_offsite_time: 'no'
         },
         sliceArea: [],
-        cbc:[]
+        cbc:[],
+        housetype: [],
+        positions: [],
+        userTypes: [],
+        meter_classifys:[]//气表类型
       }
     },
     methods: {
+      setConList(){
+        this.userTypes=this.$appdata.getParam('用户类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
+
+        this.meter_classifys=this.$appdata.getParam('气表类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('气表类型')] : [{label: '全部', value: ''}]
+
+        this.positions=this.$appdata.getParam('安装位置') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('安装位置')] : [{label: '全部', value: ''}]
+        this.housetype=this.$appdata.getParam('房屋类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('房屋类型')] : [{label: '全部', value: ''}]
+      },
       //获取省市区列表
       getPcd(val){
         this.pcds = [{label:'全部',value:''}]
@@ -613,6 +685,7 @@
       this.function = this.f
       //console.log(this.f)
       //this.remind()
+      this.setConList()
       let gen = select(this)
       //this.pianqu()
       this.Mreadibook(`('${this.$login.f.orgid}')`)