safecheck-client 3.0.33-71 → 3.0.33-73

package/src/components/userfileaudit/MeterAuditFile.vue

@@ -1,129 +1,129 @@
-<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">
-             <input class="form-control" type="text" v-model="model.f_meter_diameter" v-validate:f_meter_diameter='{ required: true }'>
-          </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('计量类型'),
-      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]
-    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
-      }
-      this.model.f_meter_brand = this.f_meter_brand[0]
-      this.model.f_meter_measurement = this.f_meter_measurement[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">
+             <input class="form-control" type="text" v-model="model.f_meter_diameter" v-validate:f_meter_diameter='{ required: true }'>
+          </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('计量类型'),
+      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]
+    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
+      }
+      this.model.f_meter_brand = this.f_meter_brand[0]
+      this.model.f_meter_measurement = this.f_meter_measurement[0]
+      this.$back()
+    }
+  }
+}
+</script>

package/src/components/userfileaudit/UserFileaudit.vue

@@ -1,81 +1,81 @@
-<template>
-  <div>
-    <criteria-paged class="search_area" :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_oldname" v-on:keyup.enter="search"
-          condition="f_user_oldname like '%{}%'">
-          用户编号:
-          <input type="text" class="form-control" v-model="model.f_user_oldid" v-on:keyup.enter="search"
-          condition="f_user_oldid like '%{}%'">
-          </div>
-          <div class="form-group">
-            <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>
-
-            审核状态：
-            <v-select id="f_approved"
-            placeholder='请选择审核状态'
-            v-model='model.f_approved'
-            :value.sync="$parent.$parent.model.f_approved"
-            :options='$parent.$parent.f_approval_states'
-            condition="f_subcompany='{}'"
-            close-on-select clear-button></v-select>
-          </div>
-          <button class="btn btn-default" @click="search()">查询</button>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>用户ID</th>
-            <th>分公司</th>
-            <th>用户姓名</th>
-            <th>审核状态</th>
-            <th>审核</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td>{{row.f_user_oldid}}</td>
-          <td>{{row.f_old_subcompany}}</td>
-          <td>{{row.f_user_oldname}}</td>
-          <td>{{row.f_approved}}</td>
-          <td><button class="btn btn-default" @click="$parent.$parent.$parent.change(row)">审核</button></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, {items: '"*"', tablename: '"t_tmp_userfiles"', groupitem: '""', orderitem: '"f_user_oldid"',
-     f_subcompany: 'this.f_subcompany[0]', f_approved: 'this.f_approved[0]'})
-    model.f_subcompany = [Vue.f_subcompany]
-    model.f_archive_date = ''
-    model.f_approved = ['']
-    return {
-      model: model,
-      f_divisions: Vue.f_subcompany != '' ? [{label: Vue.f_subcompany, value: Vue.f_subcompany}]: this.$appdata.getParam('安检系统用子公司'),
-      f_approval_states: this.$appdata.getParam('用户档案审核状态')
-    }
-  },
-  methods: {
-    change (row) {
-      this.$goto('userfile-changeaudit', {model: row})
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <criteria-paged class="search_area" :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_oldname" v-on:keyup.enter="search"
+          condition="f_user_oldname like '%{}%'">
+          用户编号:
+          <input type="text" class="form-control" v-model="model.f_user_oldid" v-on:keyup.enter="search"
+          condition="f_user_oldid like '%{}%'">
+          </div>
+          <div class="form-group">
+            <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>
+
+            审核状态：
+            <v-select id="f_approved"
+            placeholder='请选择审核状态'
+            v-model='model.f_approved'
+            :value.sync="$parent.$parent.model.f_approved"
+            :options='$parent.$parent.f_approval_states'
+            condition="f_subcompany='{}'"
+            close-on-select clear-button></v-select>
+          </div>
+          <button class="btn btn-default" @click="search()">查询</button>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>用户ID</th>
+            <th>分公司</th>
+            <th>用户姓名</th>
+            <th>审核状态</th>
+            <th>审核</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_user_oldid}}</td>
+          <td>{{row.f_old_subcompany}}</td>
+          <td>{{row.f_user_oldname}}</td>
+          <td>{{row.f_approved}}</td>
+          <td><button class="btn btn-default" @click="$parent.$parent.$parent.change(row)">审核</button></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, {items: '"*"', tablename: '"t_tmp_userfiles"', groupitem: '""', orderitem: '"f_user_oldid"',
+     f_subcompany: 'this.f_subcompany[0]', f_approved: 'this.f_approved[0]'})
+    model.f_subcompany = [Vue.f_subcompany]
+    model.f_archive_date = ''
+    model.f_approved = ['']
+    return {
+      model: model,
+      f_divisions: Vue.f_subcompany != '' ? [{label: Vue.f_subcompany, value: Vue.f_subcompany}]: this.$appdata.getParam('安检系统用子公司'),
+      f_approval_states: this.$appdata.getParam('用户档案审核状态')
+    }
+  },
+  methods: {
+    change (row) {
+      this.$goto('userfile-changeaudit', {model: row})
+    }
+  }
+}
+</script>