safecheck-client 3.0.33-97 → 3.0.33-98

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>

package/src/components/userfile/UserFile.vue

@@ -1,118 +1,118 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search'>
-        <div novalidate class="form-inline auto" partial>
-          <div class="form-group">
-          用户名:
-          <input type="text" class="form-control" v-model="model.f_user_name" v-on:keyup.enter="search"
-          condition="f_username like '%{}%'">
-          用户电话:
-          <input type="text" class="form-control" v-model="model.f_user_phone" v-on:keyup.enter="search"
-          condition="f_user_phone like '%{}%'">
-          小区地址:
-          <input type="text" class="form-control" v-model="model.f_residential_area" v-on:keyup.enter="search"
-          condition="f_districtname like '%{}%'">
-          建档月份
-          <datepicker id="startdate"
-            :value.sync="$parent.$parent.model.f_archive_date"
-            :disabled-days-of-Week="[]"
-            :format="'yyyy-MM'">
-          </datepicker>
-          <label for="f_subcompany">分公司：</label>
-          <v-select id="f_subcompany"
-          placeholder='请选择'
-          :value.sync="$parent.$parent.model.f_subcompany"
-          :options='$parent.$parent.f_divisions'
-          close-on-select clear-button></v-select>
-          <label for="f_user_state">档案状态：</label>
-          <v-select id="f_user_state"
-          placeholder='请选择'
-          :value.sync="$parent.$parent.model.f_user_state"
-          :options='$parent.$parent.f_user_states'
-          close-on-select clear-button></v-select>
-          安检员:
-          <input type="text" class="form-control" v-model="model.f_checker" v-on:keyup.enter="search"
-          condition="f_checker = '{}'">
-          <button class="btn btn-default" @click="search()">查询</button>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>用户编号</th>
-            <th>用户姓名</th>
-            <th>安检负责人</th>
-            <th>所属子公司</th>
-            <th>建档日期</th>
-            <th>用户类型</th>
-            <th>详细地址</th>
-            <th>是否录入</th>
-            <th>状态</th>
-            <th>修改</th>
-            <th>设置状态</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td>{{row.f_userid}}</td>
-          <td>{{row.f_username}}</td>
-          <td>{{row.f_checker }}</td>
-          <td>{{row.f_subcompany}}</td>
-          <td>{{row.f_archive_date}}</td>
-          <td>{{row.f_user_type}}</td>
-          <td>{{row.f_address}}</td>
-          <td>{{row.f_sign=='1'?'是':'否'}}</td>
-          <td>{{row.f_state}}</td>
-          <td>
-            <button class="btn btn-default"  @click='$parent.$parent.$parent.change(row)'>修改</button>
-          </td>
-          <td>
-            <button class="btn btn-default"  @click="$parent.$parent.$parent.writeoff(row, '正常')">正常</button>
-            <button class="btn btn-default"  @click="$parent.$parent.$parent.writeoff(row, '注销')">注销</button>
-            <button class="btn btn-default"  @click="$parent.$parent.$parent.writeoff(row, '点火')">点火</button>
-          </td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import Vue from 'vue'
-import co from 'co'
-import AppData from '../../stores/AppData'
-
-let writeOff = function * (self, row, state) {
-  yield self.$resetpost('rs/logic/档案状态修改', { data: {id: row.id, f_state: state} }, {resolveMsg: '修改状态成功！', rejectMsg:'修改状态失败！'}).then((response) => {
-    row.f_state = state
-  })
-}
-
-export default {
-  title: '档案修改',
-  props: ['f'],
-  data () {
-    let model = new PagedList('rs/sql/用户档案查询', 20, {items: '"CAST(id as varchar) strid,*"', tablename: '"t_userfiles"', groupitem: '""', orderitem: '"f_userid"',
-      f_OrgStr: `this.f_OrgStr`, f_archive_date: 'this.f_archive_date', f_state:'this.f_user_state[0]'})
-    model.f_OrgStr = Vue.f_OrgStr
-    model.f_archive_date = ''
-    model.f_user_state =['']
-    return {
-      model: model,
-      f_divisions: Vue.f_subcompany != '' ? [{label: Vue.f_subcompany, value: Vue.f_subcompany}]: this.$appdata.getParam('安检系统用子公司'),
-      f_user_states: this.$appdata.getParam('用户档案状态')
-    }
-  },
-  methods: {
-    change (row) {
-      this.$goto('userfile-change', {model: row, f: this.f})
-    },
-    writeoff (row, state) {
-      let gen = writeOff(this, row, state)
-      return co(gen)
-    },
-  }
-}
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search'>
+        <div novalidate class="form-inline auto" partial>
+          <div class="form-group">
+          用户名:
+          <input type="text" class="form-control" v-model="model.f_user_name" v-on:keyup.enter="search"
+          condition="f_username like '%{}%'">
+          用户电话:
+          <input type="text" class="form-control" v-model="model.f_user_phone" v-on:keyup.enter="search"
+          condition="f_user_phone like '%{}%'">
+          小区地址:
+          <input type="text" class="form-control" v-model="model.f_residential_area" v-on:keyup.enter="search"
+          condition="f_districtname like '%{}%'">
+          建档月份
+          <datepicker id="startdate"
+            :value.sync="$parent.$parent.model.f_archive_date"
+            :disabled-days-of-Week="[]"
+            :format="'yyyy-MM'">
+          </datepicker>
+          <label for="f_subcompany">分公司：</label>
+          <v-select id="f_subcompany"
+          placeholder='请选择'
+          :value.sync="$parent.$parent.model.f_subcompany"
+          :options='$parent.$parent.f_divisions'
+          close-on-select clear-button></v-select>
+          <label for="f_user_state">档案状态：</label>
+          <v-select id="f_user_state"
+          placeholder='请选择'
+          :value.sync="$parent.$parent.model.f_user_state"
+          :options='$parent.$parent.f_user_states'
+          close-on-select clear-button></v-select>
+          安检员:
+          <input type="text" class="form-control" v-model="model.f_checker" v-on:keyup.enter="search"
+          condition="f_checker = '{}'">
+          <button class="btn btn-default" @click="search()">查询</button>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>用户编号</th>
+            <th>用户姓名</th>
+            <th>安检负责人</th>
+            <th>所属子公司</th>
+            <th>建档日期</th>
+            <th>用户类型</th>
+            <th>详细地址</th>
+            <th>是否录入</th>
+            <th>状态</th>
+            <th>修改</th>
+            <th>设置状态</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_userid}}</td>
+          <td>{{row.f_username}}</td>
+          <td>{{row.f_checker }}</td>
+          <td>{{row.f_subcompany}}</td>
+          <td>{{row.f_archive_date}}</td>
+          <td>{{row.f_user_type}}</td>
+          <td>{{row.f_address}}</td>
+          <td>{{row.f_sign=='1'?'是':'否'}}</td>
+          <td>{{row.f_state}}</td>
+          <td>
+            <button class="btn btn-default"  @click='$parent.$parent.$parent.change(row)'>修改</button>
+          </td>
+          <td>
+            <button class="btn btn-default"  @click="$parent.$parent.$parent.writeoff(row, '正常')">正常</button>
+            <button class="btn btn-default"  @click="$parent.$parent.$parent.writeoff(row, '注销')">注销</button>
+            <button class="btn btn-default"  @click="$parent.$parent.$parent.writeoff(row, '点火')">点火</button>
+          </td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+import co from 'co'
+import AppData from '../../stores/AppData'
+
+let writeOff = function * (self, row, state) {
+  yield self.$resetpost('rs/logic/档案状态修改', { data: {id: row.id, f_state: state} }, {resolveMsg: '修改状态成功！', rejectMsg:'修改状态失败！'}).then((response) => {
+    row.f_state = state
+  })
+}
+
+export default {
+  title: '档案修改',
+  props: ['f'],
+  data () {
+    let model = new PagedList('rs/sql/用户档案查询', 20, {items: '"CAST(id as varchar) strid,*"', tablename: '"t_userfiles"', groupitem: '""', orderitem: '"f_userid"',
+      f_OrgStr: `this.f_OrgStr`, f_archive_date: 'this.f_archive_date', f_state:'this.f_user_state[0]'})
+    model.f_OrgStr = Vue.f_OrgStr
+    model.f_archive_date = ''
+    model.f_user_state =['']
+    return {
+      model: model,
+      f_divisions: Vue.f_subcompany != '' ? [{label: Vue.f_subcompany, value: Vue.f_subcompany}]: this.$appdata.getParam('安检系统用子公司'),
+      f_user_states: this.$appdata.getParam('用户档案状态')
+    }
+  },
+  methods: {
+    change (row) {
+      this.$goto('userfile-change', {model: row, f: this.f})
+    },
+    writeoff (row, state) {
+      let gen = writeOff(this, row, state)
+      return co(gen)
+    },
+  }
+}
+</script>