safecheck-client 3.0.33-126 → 3.0.33-127

package/src/components/task/TaskAnnualDetail.vue

@@ -1,47 +1,47 @@
-<template>
-  <div class="flex">
-    <div class="form-group auto">
-      <label>{{f_checker}}{{f_plan_year}}任务月完成情况</label>
-      <button type="button" class="btn btn-default" @click="this.$back('asd')">&lt;&lt;</button>
-    </div>
-    <div class="span">
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>年</th>
-            <th>月</th>
-            <th>任务</th>
-            <th>已完成</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td>{{row.f_plan_year}}</td>
-          <td>{{row.f_plan_month}}</td>
-          <td>{{row.task}}</td>
-          <td>{{row.accomplished}}</td>
-        </template>
-      </data-grid>
-    </div>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-
-export default {
-  title: '安检员年任务明细',
-  props: ['f_checker', 'f_plan_year', 'f_subcompany'],
-  data() {
-    return {
-      model: new PagedList('rs/sql/跟踪安检员年任务明细', 20, {f_checker: 'this.f_checker', f_plan_year: 'this.f_plan_year', f_subcompany: 'this.f_subcompany'})
-    }
-  },
-  ready () {
-    this.model.f_checker = this.f_checker
-    this.model.f_plan_year = this.f_plan_year
-    this.model.f_subcompany = this.f_subcompany
-    this.model.search()
-  }
-}
-</script>
+<template>
+  <div class="flex">
+    <div class="form-group auto">
+      <label>{{f_checker}}{{f_plan_year}}任务月完成情况</label>
+      <button type="button" class="btn btn-default" @click="this.$back('asd')">&lt;&lt;</button>
+    </div>
+    <div class="span">
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>年</th>
+            <th>月</th>
+            <th>任务</th>
+            <th>已完成</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_plan_year}}</td>
+          <td>{{row.f_plan_month}}</td>
+          <td>{{row.task}}</td>
+          <td>{{row.accomplished}}</td>
+        </template>
+      </data-grid>
+    </div>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+
+export default {
+  title: '安检员年任务明细',
+  props: ['f_checker', 'f_plan_year', 'f_subcompany'],
+  data() {
+    return {
+      model: new PagedList('rs/sql/跟踪安检员年任务明细', 20, {f_checker: 'this.f_checker', f_plan_year: 'this.f_plan_year', f_subcompany: 'this.f_subcompany'})
+    }
+  },
+  ready () {
+    this.model.f_checker = this.f_checker
+    this.model.f_plan_year = this.f_plan_year
+    this.model.f_subcompany = this.f_subcompany
+    this.model.search()
+  }
+}
+</script>

package/src/components/task/TaskMonthly.vue

@@ -1,89 +1,89 @@
-<template>
-  <div class="flex">
-    <form class="form-inline">
-      <div class="form-group">
-        <label for="c_plan_year">年份：</label>
-        <v-select id="c_plan_year" :value.sync="c_plan_year"
-        :options='c_year_list' close-on-select clear-button></v-select>
-        <label for="c_plan_month">月份：</label>
-        <v-select id="c_plan_month" :value.sync="c_plan_month"
-        :options='c_month_list' close-on-select clear-button></v-select>
-        <button type="button" class="btn btn-default" @click="search()">查询</button>
-      </div>
-      <div class="form-group">
-        部门:
-        <chooser :userid.sync='f.id' resource-type="organization" :width='200' :select-data.sync='model.chosenOrg'></chooser>
-      </div>
-      {{model.chosenOrg.fullname}}
-    </form>
-    <div class="span">
-      <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_checker}}</td>
-          <td>{{row.task}}</td>
-          <td>{{row.accomplished}}</td>
-        </template>
-      </data-grid>
-    </span>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import Vue from 'vue'
-
-export default {
-  title: '安检员月任务',
-  props: ['f'],
-  data() {
-    let options = []
-    let year = (new Date()).getFullYear()
-    for(let i = year - 8; i <= year +1; i++ )
-      options.push({label: i+'', value: i+''})
-    let moptions = []
-    for(let i=1; i<=12; i++)
-      moptions.push({label: i + '', value: i + ''})
-    let model = new PagedList('rs/sql/跟踪安检员月任务', 20,
-    {id: 'this.id', org_id: 'this.chosenOrg.id', f_plan_year: 'this.f_plan_year', f_subcompany: 'this.f_subcompany',
-    f_plan_month: 'this.f_plan_month', f_ym: 'this.f_ym'})
-    model.chosenOrg = {id:0}
-    return {
-      c_plan_year: year + '',
-      c_year_list: options,
-      c_month_list: moptions,
-      c_plan_month: moptions[new Date().getMonth()].value,
-      model: model
-    }
-  },
-  ready () {
-    this.model.id = this.f.id
-    this.model.chosenOrg.id = this.f.parent.id
-    this.model.f_plan_year = this.c_plan_year[0]
-    this.model.f_plan_month = this.c_plan_month[0]
-    this.model.f_subcompany = Vue.f_subcompany
-    this.model.f_ym = this.c_plan_year[0] + '-' + (this.c_plan_month[0].length > 1 ? this.c_plan_month[0] : '0' + this.c_plan_month[0])
-    this.$watch('c_plan_year', function (val) {
-        this.model.f_plan_year = val[0]
-        this.model.f_ym = val[0] + '-' + (this.c_plan_month[0].length > 1 ? this.c_plan_month[0] : '0' + this.c_plan_month[0])
-    })
-    this.$watch('c_plan_month', function (val) {
-        this.model.f_plan_month = val[0]
-        this.model.f_ym = this.c_plan_year[0] + '-' + (val[0].length > 1 ? val[0] : '0' + val[0])
-    })
-  },
-  methods: {
-    search () {
-      this.model.rows = []
-      this.model.search()
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex">
+    <form class="form-inline">
+      <div class="form-group">
+        <label for="c_plan_year">年份：</label>
+        <v-select id="c_plan_year" :value.sync="c_plan_year"
+        :options='c_year_list' close-on-select clear-button></v-select>
+        <label for="c_plan_month">月份：</label>
+        <v-select id="c_plan_month" :value.sync="c_plan_month"
+        :options='c_month_list' close-on-select clear-button></v-select>
+        <button type="button" class="btn btn-default" @click="search()">查询</button>
+      </div>
+      <div class="form-group">
+        部门:
+        <chooser :userid.sync='f.id' resource-type="organization" :width='200' :select-data.sync='model.chosenOrg'></chooser>
+      </div>
+      {{model.chosenOrg.fullname}}
+    </form>
+    <div class="span">
+      <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_checker}}</td>
+          <td>{{row.task}}</td>
+          <td>{{row.accomplished}}</td>
+        </template>
+      </data-grid>
+    </span>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '安检员月任务',
+  props: ['f'],
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    for(let i = year - 8; i <= year +1; i++ )
+      options.push({label: i+'', value: i+''})
+    let moptions = []
+    for(let i=1; i<=12; i++)
+      moptions.push({label: i + '', value: i + ''})
+    let model = new PagedList('rs/sql/跟踪安检员月任务', 20,
+    {id: 'this.id', org_id: 'this.chosenOrg.id', f_plan_year: 'this.f_plan_year', f_subcompany: 'this.f_subcompany',
+    f_plan_month: 'this.f_plan_month', f_ym: 'this.f_ym'})
+    model.chosenOrg = {id:0}
+    return {
+      c_plan_year: year + '',
+      c_year_list: options,
+      c_month_list: moptions,
+      c_plan_month: moptions[new Date().getMonth()].value,
+      model: model
+    }
+  },
+  ready () {
+    this.model.id = this.f.id
+    this.model.chosenOrg.id = this.f.parent.id
+    this.model.f_plan_year = this.c_plan_year[0]
+    this.model.f_plan_month = this.c_plan_month[0]
+    this.model.f_subcompany = Vue.f_subcompany
+    this.model.f_ym = this.c_plan_year[0] + '-' + (this.c_plan_month[0].length > 1 ? this.c_plan_month[0] : '0' + this.c_plan_month[0])
+    this.$watch('c_plan_year', function (val) {
+        this.model.f_plan_year = val[0]
+        this.model.f_ym = val[0] + '-' + (this.c_plan_month[0].length > 1 ? this.c_plan_month[0] : '0' + this.c_plan_month[0])
+    })
+    this.$watch('c_plan_month', function (val) {
+        this.model.f_plan_month = val[0]
+        this.model.f_ym = this.c_plan_year[0] + '-' + (val[0].length > 1 ? val[0] : '0' + val[0])
+    })
+  },
+  methods: {
+    search () {
+      this.model.rows = []
+      this.model.search()
+    }
+  }
+}
+</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>