system-clients 1.6.68 → 1.6.69-foric

package/SystemClient.iml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.6.18" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.6.5" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

package/build.gradle

@@ -1,4 +1,4 @@
-version = '1.6.65'
+version = '1.6.62'
 
 task release(type:Exec) {
 	workingDir '.'

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "system-clients",
-  "version": "1.6.68",
+  "version": "1.6.69-foric",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
+    "doc": "doc",
     "example": "examples",
     "test": "test"
   },
@@ -76,7 +77,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "1.21.32",
+    "vue-client": "1.21.23",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/equipment/PcAdd.vue

@@ -1,109 +1,109 @@
-<template>
-  <div class="auto select-overspread">
-    <validator name='v'>
-      <ul class="nav nav-tabs" >
-        <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
-      </ul>
-      <form class="form-horizontal">
-        <div class="row">
-          <div class="col-sm-4 form-group form-input-group">
-            <label class="control-label">使用人员</label>
-            <input type="text" class="form-control" v-model="model.f_username" placeholder="使用人员" >
-          </div>
-          <div class="col-sm-4 form-group form-input-group">
-            <label class="control-label">所属地址</label>
-            <input type="text" class="form-control" v-model="model.f_mac_outlets" placeholder="所属地址" >
-          </div>
-          <div class="col-sm-4 form-group form-input-group">
-            <label class="control-label">mac地址</label>
-            <input type="text" class="form-control" v-model="model.f_mac_number" placeholder="mac地址" >
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-sm-4 form-group form-input-group">
-            <label class=" col-sm-2 control-label">使用公司</label>
-            <div class="col-sm-2">
-              <res-select restype='organization'
-                          is-mul="false"
-                          @res-select="getorg"
-                          :initresid="curorgid">
-              </res-select>
-            </div>
-          </div>
-        </div>
-      </form>
-      <div style="text-align:right;height:auto;">
-        <button class="btn btn-success " @click="confirm()"  >确认</button>
-        <button class="btn btn-default " @click="cancel()" >取消</button>
-      </div>
-    </validator>
-  </div>
-</template>
-<script>
-
-
-  export default {
-    data () {
-      return {
-        model: {
-          f_username: '',
-          f_mac_outlets: '',
-          f_mac_number: '',
-          f_equipment_type: 'PC',
-          f_state: '正常'
-        },
-        curorgid: this.$login.f.orgid,
-        f_orgid: ''
-      }
-    },
-    props: ['data'],
-    watch: {
-      'data' (val) {
-          if (val) {
-            this.edit(val)
-          } else {
-              this.initModel()
-          }
-      }
-    },
-    ready () {
-      console.log('mac信息：', this.data)
-      if (this.data) {
-          this.edit(this.data)
-      }
-    },
-    methods: {
-      confirm () {
-        this.model.f_operator = this.$login.f.name
-        this.model.f_operatorid = this.$login.f.id
-        this.model.f_orgid = this.f_orgid
-        console.log('保存', this.model)
-        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
-          this.$dispatch('refresh')
-        }).catch((error) => {
-          this.$dispatch('refresh')
-        })
-      },
-      edit (row) {
-        console.log('修改，，。。', row)
-        this.model.f_username = row.f_username
-        this.model.f_mac_outlets = row.f_mac_outlets
-        this.model.f_mac_number = row.f_mac_number
-        this.model.id = row.id
-        this.f_orgid = row.f_orgid
-      },
-      initModel () {
-        delete this.model.id
-        this.model.f_username = ''
-        this.model.f_mac_outlets = ''
-        this.model.f_mac_number = ''
-      },
-      cancel () {
-        this.$dispatch('close')
-      },
-      getorg (val) {
-        this.f_orgid = val[0]
-      }
-    }
-  }
-</script>
+<template>
+  <div class="auto select-overspread">
+    <validator name='v'>
+      <ul class="nav nav-tabs" >
+        <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
+      </ul>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">使用人员</label>
+            <input type="text" class="form-control" v-model="model.f_username" placeholder="使用人员" >
+          </div>
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">所属地址</label>
+            <input type="text" class="form-control" v-model="model.f_mac_outlets" placeholder="所属地址" >
+          </div>
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">mac地址</label>
+            <input type="text" class="form-control" v-model="model.f_mac_number" placeholder="mac地址" >
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group form-input-group">
+            <label class=" col-sm-2 control-label">使用公司</label>
+            <div class="col-sm-2">
+              <res-select restype='organization'
+                          is-mul="false"
+                          @res-select="getorg"
+                          :initresid="curorgid">
+              </res-select>
+            </div>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;height:auto;">
+        <button class="btn btn-success " @click="confirm()"  >确认</button>
+        <button class="btn btn-default " @click="cancel()" >取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+
+
+  export default {
+    data () {
+      return {
+        model: {
+          f_username: '',
+          f_mac_outlets: '',
+          f_mac_number: '',
+          f_equipment_type: 'PC',
+          f_state: '正常'
+        },
+        curorgid: this.$login.f.orgid,
+        f_orgid: ''
+      }
+    },
+    props: ['data'],
+    watch: {
+      'data' (val) {
+          if (val) {
+            this.edit(val)
+          } else {
+              this.initModel()
+          }
+      }
+    },
+    ready () {
+      console.log('mac信息：', this.data)
+      if (this.data) {
+          this.edit(this.data)
+      }
+    },
+    methods: {
+      confirm () {
+        this.model.f_operator = this.$login.f.name
+        this.model.f_operatorid = this.$login.f.id
+        this.model.f_orgid = this.f_orgid
+        console.log('保存', this.model)
+        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+          this.$dispatch('refresh')
+        }).catch((error) => {
+          this.$dispatch('refresh')
+        })
+      },
+      edit (row) {
+        console.log('修改，，。。', row)
+        this.model.f_username = row.f_username
+        this.model.f_mac_outlets = row.f_mac_outlets
+        this.model.f_mac_number = row.f_mac_number
+        this.model.id = row.id
+        this.f_orgid = row.f_orgid
+      },
+      initModel () {
+        delete this.model.id
+        this.model.f_username = ''
+        this.model.f_mac_outlets = ''
+        this.model.f_mac_number = ''
+      },
+      cancel () {
+        this.$dispatch('close')
+      },
+      getorg (val) {
+        this.f_orgid = val[0]
+      }
+    }
+  }
+</script>

package/src/components/equipment/PcList.vue

@@ -1,107 +1,107 @@
-<template>
-  <div class="flex" style="flex:1; ">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div novalidate class="form-inline" partial>
-          <div class="form-group">
-            <label>使用公司</label>
-            <res-select restype='organization'
-                        is-mul="false"
-                        @res-select="$parent.$parent.getorg"
-                        :initresid="$parent.$parent.curorgid">
-            </res-select>
-          </div>
-
-          <div class="form-group" >
-            <input  type="text" class="form-control" v-model="model.f_username"
-                    condition="f_username like '%{}%'" placeholder="使用人员">
-          </div>
-          <div class="form-group" >
-            <input  type="text" class="form-control" v-model="model.f_mac_outlets"
-                    condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
-          </div>
-          <div class="form-group" >
-            <input  type="text" class="form-control" v-model="model.f_mac_number"
-                    condition="f_mac_number like '%{}%'" placeholder="MAC地址">
-          </div>
-
-          <div class="form-group">
-            <button class="btn btn-success width-80" @click="$parent.$parent.search()" v-el:cx>查询</button>
-          </div>
-          <div class="form-group">
-            <button class="btn btn-success width-80" @click="$parent.$parent.add()" v-el:cx>新增</button>
-          </div>
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' v-ref:grid >
-        <template partial='head'>
-          <tr>
-            <th>序号</th>
-            <th>使用人员</th>
-            <th>所属地址</th>
-            <th>MAC地址</th>
-            <th>操作</th>
-          </tr>
-        </template>
-        <template partial='body':model="model">
-          <tr>
-            <td style="text-align:center">{{$index+1}}</td>
-            <td style="text-align:center">{{row.f_username}}</td>
-            <td style="text-align:center">{{row.f_mac_outlets}}</td>
-            <td style="text-align:center">{{row.f_mac_number}}</td>
-            <td style="text-align:center">
-              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-
-  export default {
-    title: 'PC',
-    components: {},
-    data () {
-      return {
-        model: new PagedList('rs/sql/equipmentQuery', 20),
-        curorgid: [this.$login.f.orgid],
-        f_orgid: ''
-      }
-    },
-    ready () {
-      this.search()
-    },
-    methods: {
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-
-      selfSearch (args) {
-        args.condition =  `${args.condition} and f_equipment_type = 'PC' and f_state = '正常' and f_orgid like '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
-        this.model.search(args.condition, this.model)
-      },
-      add () {
-        this.$dispatch('add')
-      },
-      del (row) {
-        console.log('要删除了', row)
-        row.f_state = '已删除'
-        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-          this.$dispatch('refresh')
-        }).catch((error) => {
-          this.$dispatch('refresh')
-        })
-      },
-      getorg (val) {
-        this.f_orgid = val[0]
-      }
-    },
-    computed: {
-
-    }
-  }
-</script>
+<template>
+  <div class="flex" style="flex:1; ">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-inline" partial>
+          <div class="form-group">
+            <label>使用公司</label>
+            <res-select restype='organization'
+                        is-mul="false"
+                        @res-select="$parent.$parent.getorg"
+                        :initresid="$parent.$parent.curorgid">
+            </res-select>
+          </div>
+
+          <div class="form-group" >
+            <input  type="text" class="form-control" v-model="model.f_username"
+                    condition="f_username like '%{}%'" placeholder="使用人员">
+          </div>
+          <div class="form-group" >
+            <input  type="text" class="form-control" v-model="model.f_mac_outlets"
+                    condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
+          </div>
+          <div class="form-group" >
+            <input  type="text" class="form-control" v-model="model.f_mac_number"
+                    condition="f_mac_number like '%{}%'" placeholder="MAC地址">
+          </div>
+
+          <div class="form-group">
+            <button class="btn btn-success width-80" @click="$parent.$parent.search()" v-el:cx>查询</button>
+          </div>
+          <div class="form-group">
+            <button class="btn btn-success width-80" @click="$parent.$parent.add()" v-el:cx>新增</button>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th>序号</th>
+            <th>使用人员</th>
+            <th>所属地址</th>
+            <th>MAC地址</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body':model="model">
+          <tr>
+            <td style="text-align:center">{{$index+1}}</td>
+            <td style="text-align:center">{{row.f_username}}</td>
+            <td style="text-align:center">{{row.f_mac_outlets}}</td>
+            <td style="text-align:center">{{row.f_mac_number}}</td>
+            <td style="text-align:center">
+              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    title: 'PC',
+    components: {},
+    data () {
+      return {
+        model: new PagedList('rs/sql/equipmentQuery', 20),
+        curorgid: [this.$login.f.orgid],
+        f_orgid: ''
+      }
+    },
+    ready () {
+      this.search()
+    },
+    methods: {
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+
+      selfSearch (args) {
+        args.condition =  `${args.condition} and f_equipment_type = 'PC' and f_state = '正常' and f_orgid like '${this.f_orgid ? this.f_orgid: this.$login.f.orgid}'`
+        this.model.search(args.condition, this.model)
+      },
+      add () {
+        this.$dispatch('add')
+      },
+      del (row) {
+        console.log('要删除了', row)
+        row.f_state = '已删除'
+        this.$resetpost('rs/entity/t_equipment', row, {warnMsg: '确定要删除这条信息吗？', resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+          this.$dispatch('refresh')
+        }).catch((error) => {
+          this.$dispatch('refresh')
+        })
+      },
+      getorg (val) {
+        this.f_orgid = val[0]
+      }
+    },
+    computed: {
+
+    }
+  }
+</script>