safecheck-client 4.0.2-4 → 4.0.2-6

package/src/components/report/CheckByPlan.vue

@@ -1,118 +1,118 @@
-<template>
-  <div id='app' class="basic-main" style="height: 100%">
-    <criteria-paged :model="model" :pager='false' v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
-        <div novalidate class="form-inline auto" partial>
-          <div class="row">
-            <div class="col-sm-4 form-group">
-              <role-selector-safe
-                role-name="安检员"
-                role-lable="安&ensp;检&ensp;员"
-                @re-res="$parent.$parent.getRes"
-                :value.sync="model.f_checker_id"
-                v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
-              </role-selector-safe>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label for="startDate" class="font_normal_body">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          style="width: 60%;"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label for="endDate" class="font_normal_body">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          style="width: 60%;"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-3 form-group" style="margin-top: 8px">
-              <button class="button_search button_spacing" @click="search()">查询</button>
-              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
-              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
-          <thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">安检数据报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal;">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </th>
-          </tr>
-        </table>
-      </div>
-    </criteria-paged>
-  </div>
-
-</template>
-
-<script>
-  import {DataModel} from 'vue-client'
-  import * as Util from "../Util";
-
-  export default {
-    title: '安检员安检情况报表',
-    data() {
-      let model = new DataModel('/api/af-safecheck/report/checkByPlan')
-      model.f_filialeid = this.$login.f.orgid
-      return {
-        filialeNameStr: '',
-        filialeCodeStr: '',
-        userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
-        model: model
-      }
-    },
-    methods: {
-      getRes(obj) {
-        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
-      },
-      search(args){
-        if (this.model.f_filialeid) {
-          args.condition += ` and tcp.f_filialeid in ${this.model.f_filialeid}`
-        }
-        if (args.model.startDate){
-          args.condition += ` and tcp.f_offsite_time >= '${args.model.startDate}'`
-        }
-        if (args.model.endDate){
-          args.condition += ` and tcp.f_offsite_time <= '${args.model.endDate}'`
-        }
-        this.model.search(args.condition,args.model)
-      }
-    },
-    ready() {
-      this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString()+' 00:00:00'
-      this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+' 23:59:59'
-    },
-    computed: {
-      selected() {
-        return this.$refs.grid.selected
-      },
-    }
-  }
-</script>
+<template>
+  <div id='app' class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
+        <div novalidate class="form-inline auto" partial>
+          <div class="row">
+            <div class="col-sm-4 form-group">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id"
+                condition="f_checker_name = '{}'">
+              </role-selector-safe>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="startDate" class="font_normal_body">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          style="width: 60%;"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="endDate" class="font_normal_body">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-3 form-group" style="margin-top: 8px">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
+              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">安检数据报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import {DataModel} from 'vue-client'
+  import * as Util from "../Util";
+
+  export default {
+    title: '安检员安检情况报表',
+    data() {
+      let model = new DataModel('/api/af-safecheck/report/checkByPlan')
+      model.f_filialeid = this.$login.f.orgid
+      return {
+        filialeNameStr: '',
+        filialeCodeStr: '',
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model
+      }
+    },
+    methods: {
+      getRes(obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
+      },
+      search(args){
+        if (this.model.f_filialeid) {
+          args.condition += ` and tcp.f_filialeid in ${this.model.f_filialeid}`
+        }
+        if (args.model.startDate){
+          args.condition += ` and tcp.f_offsite_time >= '${args.model.startDate}'`
+        }
+        if (args.model.endDate){
+          args.condition += ` and tcp.f_offsite_time <= '${args.model.endDate}'`
+        }
+        this.model.search(args.condition,args.model)
+      }
+    },
+    ready() {
+      this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString()+' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+' 23:59:59'
+    },
+    computed: {
+      selected() {
+        return this.$refs.grid.selected
+      },
+    }
+  }
+</script>

package/src/components/userfile/MeterFile.vue

@@ -1,145 +1,145 @@
-<template>
-<div style="overflow-x: hidden;">
-  <validator name='v'>
-    <form novalidate class="form-horizontal">
-      <div class="form-group">
-        <label for="f_card_id" class="col-sm-offset-1 col-sm-1 control-label">卡号:</label>
-        <div class="col-sm-2">
-            <input class="form-control" type="text" v-model="model.f_card_id"  v-validate:f_card_id='{ required: true }'>
-        </div>
-
-        <label for="f_meter_no" class="col-sm-1 control-label">表号:</label>
-        <div class="col-sm-2">
-           <input class="form-control" type="text" v-model="model.f_meter_no" v-validate:f_meter_no='{ required: true }'>
-        </div>
-         <label for="f_meter_brand" class="col-sm-1 control-label">表牌:</label>
-         <div class="col-sm-2">
-            <!-- <input class="form-control" type="text" v-model="model.f_meter_brand" > -->
-            <v-select id="f_meter_brand"
-            placeholder='请选择'
-            :value.sync="f_meter_brand"
-            :options='f_meterbrand'
-            close-on-select clear-button></v-select>
-          </div>
-        </div>
-
-        <div class="form-group">
-          <label for="f_meter_measurement" class="col-sm-offset-1 col-sm-1 control-label">计量类型:</label>
-          <div class="col-sm-2">
-              <v-select id="f_meter_measurement"
-              placeholder='请选择'
-              :value.sync="f_meter_measurement"
-              :options='f_metermeasurement'
-              close-on-select clear-button></v-select>
-          </div>
-          <label for="f_meter_diameter" class="col-sm-1 control-label">表径:</label>
-          <div class="col-sm-2">
-              <v-select id="f_meter_diameter"
-              placeholder='请选择'
-              :value.sync="f_meter_diameter"
-              :options='f_meterdiameters'
-              close-on-select clear-button></v-select>
-          </div>
-           <label for="f_meter_reading" class="col-sm-1 control-label">机表读数:</label>
-           <div class="col-sm-2">
-             <input class="form-control" type="text" v-model="model.f_meter_reading"  number v-validate:f_meter_reading='{ required: true }'>
-            </div>
-          </div>
-
-        <div class="form-group">
-           <label for="f_meter_remain" class="col-sm-offset-1 col-sm-1 control-label">剩余气量:</label>
-           <div class="col-sm-2">
-              <input class="form-control" type="text" v-model="model.f_meter_remain" number v-validate:f_meter_remain='{ required: true }'>
-           </div>
-           <label for="f_meter_total" class="col-sm-1 control-label">购气总量:</label>
-            <div class="col-sm-2">
-               <input class="form-control" type="text" v-model="model.f_meter_total" v-validate:f_meter_total='{ required: true }'>
-            </div>
-
-            <label for="f_meter_accumulation" class="col-sm-1 control-label">累计用气量:</label>
-            <div class="col-sm-2">
-              <input class="form-control" type="text" v-model="model.f_meter_accumulation" v-validate:f_meter_accumulation='{ required: true }'>
-            </div>
-          </div>
-
-          <div class="form-group">
-             <label for="f_remark" class="col-sm-offset-1 col-sm-1 control-label">备注:</label>
-             <div class="col-sm-2">
-                <input class="form-control" type="text" v-model="model.f_remark">
-             </div>
-            </div>
-        </form>
-        <div style="text-align:center;height:auto;">
-          <button class="btn btn-primary" :disabled='!($v.valid)' @click="confirm()" style="width:100px;margin-left:20px;">
-            <span class="glyphicon glyphicon-floppy-disk"></span>保存
-          </button>
-          <button class="btn btn-default"  @click='cancel()' style="width:100px;margin-left:20px;">
-            <span class="glyphicon glyphicon-log-out"></span>取消
-          </button>
-        </div>
-  </validator>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import Vue from 'vue'
-import * as Util from '../Util'
-import AppData from '../../stores/AppData'
-
-export default {
-  title: '表档案修改',
-  props: ['model'],
-  data () {
-    return {
-      f_meter_brand: [''],
-      f_meterbrand: this.$appdata.getParam('燃气表品牌'),
-      f_meter_measurement: [''],
-      f_metermeasurement: this.$appdata.getParam('计量类型'),
-      f_meter_diameter: [''],
-      f_meterdiameters: this.$appdata.getParam('表径'),
-      rowCopy: {}
-    }
-  },
-  ready () {
-    if(this.model.f_meter_brand)
-      this.f_meter_brand = [this.model.f_meter_brand]
-    if(this.model.f_meter_measurement)
-      this.f_meter_measurement = [this.model.f_meter_measurement]
-    if(this.model.f_meter_diameter)
-      this.f_meter_diameter = [this.model.f_meter_diameter]
-    this.rowCopy = JSON.stringify(this.model)
-  },
-  methods: {
-    cancel () {
-      let tmp = JSON.parse(this.rowCopy)
-      for(let prop in this.model)
-        if(tmp.hasOwnProperty(prop)) {
-          this.model[prop] = tmp[prop]
-        }
-      this.$back()
-    },
-    confirm () {
-      if (!this.f_meter_brand[0]) {
-        window.alert('请选择燃气表品牌！')
-        return
-      }
-      if (!this.f_meter_measurement[0]) {
-        window.alert('请选择计量类型！')
-        return
-      }
-      if (!this.f_meter_diameter[0]) {
-        window.alert('请选择表径！')
-        return
-      }
-      if(!this.model.id) {
-        this.model.id = Util.guid()
-      }
-      this.model.f_meter_brand = this.f_meter_brand[0]
-      this.model.f_meter_measurement = this.f_meter_measurement[0]
-      this.model.f_meter_diameter = this.f_meter_diameter[0]
-      this.$back()
-    }
-  }
-}
-</script>
+<template>
+<div style="overflow-x: hidden;">
+  <validator name='v'>
+    <form novalidate class="form-horizontal">
+      <div class="form-group">
+        <label for="f_card_id" class="col-sm-offset-1 col-sm-1 control-label">卡号:</label>
+        <div class="col-sm-2">
+            <input class="form-control" type="text" v-model="model.f_card_id"  v-validate:f_card_id='{ required: true }'>
+        </div>
+
+        <label for="f_meter_no" class="col-sm-1 control-label">表号:</label>
+        <div class="col-sm-2">
+           <input class="form-control" type="text" v-model="model.f_meter_no" v-validate:f_meter_no='{ required: true }'>
+        </div>
+         <label for="f_meter_brand" class="col-sm-1 control-label">表牌:</label>
+         <div class="col-sm-2">
+            <!-- <input class="form-control" type="text" v-model="model.f_meter_brand" > -->
+            <v-select id="f_meter_brand"
+            placeholder='请选择'
+            :value.sync="f_meter_brand"
+            :options='f_meterbrand'
+            close-on-select clear-button></v-select>
+          </div>
+        </div>
+
+        <div class="form-group">
+          <label for="f_meter_measurement" class="col-sm-offset-1 col-sm-1 control-label">计量类型:</label>
+          <div class="col-sm-2">
+              <v-select id="f_meter_measurement"
+              placeholder='请选择'
+              :value.sync="f_meter_measurement"
+              :options='f_metermeasurement'
+              close-on-select clear-button></v-select>
+          </div>
+          <label for="f_meter_diameter" class="col-sm-1 control-label">表径:</label>
+          <div class="col-sm-2">
+              <v-select id="f_meter_diameter"
+              placeholder='请选择'
+              :value.sync="f_meter_diameter"
+              :options='f_meterdiameters'
+              close-on-select clear-button></v-select>
+          </div>
+           <label for="f_meter_reading" class="col-sm-1 control-label">机表读数:</label>
+           <div class="col-sm-2">
+             <input class="form-control" type="text" v-model="model.f_meter_reading"  number v-validate:f_meter_reading='{ required: true }'>
+            </div>
+          </div>
+
+        <div class="form-group">
+           <label for="f_meter_remain" class="col-sm-offset-1 col-sm-1 control-label">剩余气量:</label>
+           <div class="col-sm-2">
+              <input class="form-control" type="text" v-model="model.f_meter_remain" number v-validate:f_meter_remain='{ required: true }'>
+           </div>
+           <label for="f_meter_total" class="col-sm-1 control-label">购气总量:</label>
+            <div class="col-sm-2">
+               <input class="form-control" type="text" v-model="model.f_meter_total" v-validate:f_meter_total='{ required: true }'>
+            </div>
+
+            <label for="f_meter_accumulation" class="col-sm-1 control-label">累计用气量:</label>
+            <div class="col-sm-2">
+              <input class="form-control" type="text" v-model="model.f_meter_accumulation" v-validate:f_meter_accumulation='{ required: true }'>
+            </div>
+          </div>
+
+          <div class="form-group">
+             <label for="f_remark" class="col-sm-offset-1 col-sm-1 control-label">备注:</label>
+             <div class="col-sm-2">
+                <input class="form-control" type="text" v-model="model.f_remark">
+             </div>
+            </div>
+        </form>
+        <div style="text-align:center;height:auto;">
+          <button class="btn btn-primary" :disabled='!($v.valid)' @click="confirm()" style="width:100px;margin-left:20px;">
+            <span class="glyphicon glyphicon-floppy-disk"></span>保存
+          </button>
+          <button class="btn btn-default"  @click='cancel()' style="width:100px;margin-left:20px;">
+            <span class="glyphicon glyphicon-log-out"></span>取消
+          </button>
+        </div>
+  </validator>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+import * as Util from '../Util'
+import AppData from '../../stores/AppData'
+
+export default {
+  title: '表档案修改',
+  props: ['model'],
+  data () {
+    return {
+      f_meter_brand: [''],
+      f_meterbrand: this.$appdata.getParam('燃气表品牌'),
+      f_meter_measurement: [''],
+      f_metermeasurement: this.$appdata.getParam('计量类型'),
+      f_meter_diameter: [''],
+      f_meterdiameters: this.$appdata.getParam('表径'),
+      rowCopy: {}
+    }
+  },
+  ready () {
+    if(this.model.f_meter_brand)
+      this.f_meter_brand = [this.model.f_meter_brand]
+    if(this.model.f_meter_measurement)
+      this.f_meter_measurement = [this.model.f_meter_measurement]
+    if(this.model.f_meter_diameter)
+      this.f_meter_diameter = [this.model.f_meter_diameter]
+    this.rowCopy = JSON.stringify(this.model)
+  },
+  methods: {
+    cancel () {
+      let tmp = JSON.parse(this.rowCopy)
+      for(let prop in this.model)
+        if(tmp.hasOwnProperty(prop)) {
+          this.model[prop] = tmp[prop]
+        }
+      this.$back()
+    },
+    confirm () {
+      if (!this.f_meter_brand[0]) {
+        window.alert('请选择燃气表品牌！')
+        return
+      }
+      if (!this.f_meter_measurement[0]) {
+        window.alert('请选择计量类型！')
+        return
+      }
+      if (!this.f_meter_diameter[0]) {
+        window.alert('请选择表径！')
+        return
+      }
+      if(!this.model.id) {
+        this.model.id = Util.guid()
+      }
+      this.model.f_meter_brand = this.f_meter_brand[0]
+      this.model.f_meter_measurement = this.f_meter_measurement[0]
+      this.model.f_meter_diameter = this.f_meter_diameter[0]
+      this.$back()
+    }
+  }
+}
+</script>

package/src/components/userfile/MeterModify.vue

@@ -1,46 +1,46 @@
-<template>
-  <div class="form-group">
-    <label  class="col-sm-6 control-label">表品牌:</label>
-    <div class="col-sm-6">{{content.f_maker}}</div>
-  </div>
-  <div class="form-group">
-    <label class="col-sm-6 control-label">表型号:</label>
-    <div class="col-sm-6">{{content.f_diaphgram_size}}</div>
-  </div>
-  <div class="form-group">
-    <label class="col-sm-6 control-label">表号：</label>
-    <div class="col-sm-6">{{content.f_meter_no}}</div>
-  </div>
-  <div class="form-group">
-    <label class="col-sm-6 control-label">表底数:</label>
-    <div class="col-sm-6">{{content.f_prior_reading}}</div>
-  </div>
-  <div class="form-group">
-    <label  class="col-sm-6 control-label">进气方向:</label>
-    <div class="col-sm-6">{{content.f_flow_direction}}</div>
-  </div>
-  <div class="form-group">
-    <label  class="col-sm-6 control-label">安装位置:</label>
-    <div class="col-sm-6">{{content.f_weizhi}}</div>
-  </div>
-  <div class="form-group">
-  <label class="col-sm-6 control-label">累计购气量</label>
-  <div class="col-sm-6">{{content.f_remaining_gas}}</div>
-</div>
-  <div class="form-group">
-    <label class="col-sm-6 control-label">生产日期</label>
-    <div class="col-sm-6">{{content.f_making_date}}</div>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: "用户表信息修改内容",
-    props:['content'],
-    data(){
-      return{
-        content: ''
-      }
-    }
-  }
-</script>
+<template>
+  <div class="form-group">
+    <label  class="col-sm-6 control-label">表品牌:</label>
+    <div class="col-sm-6">{{content.f_maker}}</div>
+  </div>
+  <div class="form-group">
+    <label class="col-sm-6 control-label">表型号:</label>
+    <div class="col-sm-6">{{content.f_diaphgram_size}}</div>
+  </div>
+  <div class="form-group">
+    <label class="col-sm-6 control-label">表号：</label>
+    <div class="col-sm-6">{{content.f_meter_no}}</div>
+  </div>
+  <div class="form-group">
+    <label class="col-sm-6 control-label">表底数:</label>
+    <div class="col-sm-6">{{content.f_prior_reading}}</div>
+  </div>
+  <div class="form-group">
+    <label  class="col-sm-6 control-label">进气方向:</label>
+    <div class="col-sm-6">{{content.f_flow_direction}}</div>
+  </div>
+  <div class="form-group">
+    <label  class="col-sm-6 control-label">安装位置:</label>
+    <div class="col-sm-6">{{content.f_weizhi}}</div>
+  </div>
+  <div class="form-group">
+  <label class="col-sm-6 control-label">累计购气量</label>
+  <div class="col-sm-6">{{content.f_remaining_gas}}</div>
+</div>
+  <div class="form-group">
+    <label class="col-sm-6 control-label">生产日期</label>
+    <div class="col-sm-6">{{content.f_making_date}}</div>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: "用户表信息修改内容",
+    props:['content'],
+    data(){
+      return{
+        content: ''
+      }
+    }
+  }
+</script>