safecheck-client 3.0.33-63 → 3.0.33-66

package/src/components/android/CheckUnplanPage.vue

@@ -1,56 +1,56 @@
-<template>
-  <div class="app-bg auto">
-    <tools-page :need-back='false' title="无计划安检相关"></tools-page>
-      <div class="app-input flex-between" @click = "gotopage('lcheck-unplan')">
-        <label class="control-label text-left flex-full" style="flex: 1;">用户安检</label>
-        <span class="glyphicon glyphicon-chevqron-right flex-full text-right" ></span>
-      </div>
-      <div class="app-input flex-between" @click = "gotopage('upload-page')">
-        <label class="control-label text-left flex-full" style="flex: 1;">批量上传</label>
-        <span class="glyphicon glyphicon-chevron-right flex-full text-right"></span>
-      </div>
-      <div class="app-input flex-between" @click = "gotopage('query-check-history')">
-        <label class="control-label text-left flex-full" style="flex: 1;">历史安检信息查看</label>
-        <span class="glyphicon glyphicon-chevron-right flex-full text-right"></span>
-      </div>
-  </div>
-</template>
-
-<script>
-
-import co from 'co'
-import { PagedList } from 'vue-client'
-import Vue from 'vue'
-
-export default {
-    title: '安检计划相关',
-    data() {
-        return {
-            model: {}
-        }
-    },
-    methods: {
-      gotopage(param,props) {
-        this.$goto(param,props)
-      },
-      //头部事件回掉
-      back () {
-        this.$back()
-      },
-    }
-}
-
-</script>
-<style scoped>
-.flex-between {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.flex-between span {
-  padding-right: 10px;
-}
-.flex-full {
-  flex: 1;
-}
-</style>
+<template>
+  <div class="app-bg auto">
+    <tools-page :need-back='false' title="无计划安检相关"></tools-page>
+      <div class="app-input flex-between" @click = "gotopage('lcheck-unplan')">
+        <label class="control-label text-left flex-full" style="flex: 1;">用户安检</label>
+        <span class="glyphicon glyphicon-chevqron-right flex-full text-right" ></span>
+      </div>
+      <div class="app-input flex-between" @click = "gotopage('upload-page')">
+        <label class="control-label text-left flex-full" style="flex: 1;">批量上传</label>
+        <span class="glyphicon glyphicon-chevron-right flex-full text-right"></span>
+      </div>
+      <div class="app-input flex-between" @click = "gotopage('query-check-history')">
+        <label class="control-label text-left flex-full" style="flex: 1;">历史安检信息查看</label>
+        <span class="glyphicon glyphicon-chevron-right flex-full text-right"></span>
+      </div>
+  </div>
+</template>
+
+<script>
+
+import co from 'co'
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+
+export default {
+    title: '安检计划相关',
+    data() {
+        return {
+            model: {}
+        }
+    },
+    methods: {
+      gotopage(param,props) {
+        this.$goto(param,props)
+      },
+      //头部事件回掉
+      back () {
+        this.$back()
+      },
+    }
+}
+
+</script>
+<style scoped>
+.flex-between {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.flex-between span {
+  padding-right: 10px;
+}
+.flex-full {
+  flex: 1;
+}
+</style>

package/src/components/android/Checker.vue

@@ -1,12 +1,12 @@
-<template>
-  <div>
-    <route :comp="{name: 'checker-main'}"></route>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '安检导航界面',
-  props: ['orgs'],
-}
-</script>
+<template>
+  <div>
+    <route :comp="{name: 'checker-main'}"></route>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '安检导航界面',
+  props: ['orgs'],
+}
+</script>

package/src/components/android/CheckerAnnual.vue

@@ -1,81 +1,81 @@
-<template>
-  <div>
-    <form>
-      <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>
-      </div>
-    </form>
-    <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_checker}}</td>
-        <td>{{row.task}}</td>
-        <td>{{row.accomplished}}</td>
-        <td v-on:click.stop.prevent='$parent.$parent.showDetail(row)'><span class="glyphicon glyphicon-option-horizontal"></span></td>
-      </template>
-    </data-grid>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-
-let aggCheckerTask = function * (self) {
-    let result = yield self.$post(Vue.url + 'sql/统计安检员年任务?pageNo=1&pageSize=9999', {
-        data: {
-            id: Vue.user.id,
-            org_id: Vue.user.parentid,
-            f_plan_year: self.c_plan_year[0],
-            f_subcompany: Vue.user.f_subcompany
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取任务出错'
-    })
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '安检员年任务',
-  data() {
-    let options = []
-    let year = (new Date()).getFullYear()
-    options.push({label: year+'', value: year+''})
-    year++
-    options.push({label: year+'', value: year+''})
-    return {
-      c_plan_year: options[0].value,
-      c_year_list: options,
-      model: {
-        rows: [],
-      }
-    }
-  },
-  ready () {
-    this.$watch('c_plan_year', function (val) {
-        this.getPlan()
-    })
-    this.getPlan()
-  },
-  methods: {
-    getPlan () {
-      let fp = aggCheckerTask(this)
-      co(fp)
-    },
-    showDetail (row) {
-      this.$parent.$goto('checker-annual-detail', {f_plan_year: this.c_plan_year[0], f_checker: row.f_checker}, 'master-router')
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <form>
+      <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>
+      </div>
+    </form>
+    <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_checker}}</td>
+        <td>{{row.task}}</td>
+        <td>{{row.accomplished}}</td>
+        <td v-on:click.stop.prevent='$parent.$parent.showDetail(row)'><span class="glyphicon glyphicon-option-horizontal"></span></td>
+      </template>
+    </data-grid>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+
+let aggCheckerTask = function * (self) {
+    let result = yield self.$post(Vue.url + 'sql/统计安检员年任务?pageNo=1&pageSize=9999', {
+        data: {
+            id: Vue.user.id,
+            org_id: Vue.user.parentid,
+            f_plan_year: self.c_plan_year[0],
+            f_subcompany: Vue.user.f_subcompany
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取任务出错'
+    })
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '安检员年任务',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    options.push({label: year+'', value: year+''})
+    year++
+    options.push({label: year+'', value: year+''})
+    return {
+      c_plan_year: options[0].value,
+      c_year_list: options,
+      model: {
+        rows: [],
+      }
+    }
+  },
+  ready () {
+    this.$watch('c_plan_year', function (val) {
+        this.getPlan()
+    })
+    this.getPlan()
+  },
+  methods: {
+    getPlan () {
+      let fp = aggCheckerTask(this)
+      co(fp)
+    },
+    showDetail (row) {
+      this.$parent.$goto('checker-annual-detail', {f_plan_year: this.c_plan_year[0], f_checker: row.f_checker}, 'master-router')
+    }
+  }
+}
+</script>

package/src/components/android/CheckerAvarta.vue

@@ -1,82 +1,82 @@
-<template>
-  <div class="container">
-    <http-busy>
-      <div class="row">
-        <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 col-xs-offset-0 col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad" >
-          <div class="panel panel-info">
-            <div class="panel-heading">
-              <h3 class="panel-title">安检员信息，请仔细核对</h3>
-            </div>
-            <div class="panel-body">
-              <div class="row">
-                <div class="col-md-3 col-lg-3 " align="center"> <img alt="照片" :src="imgsrc" class="img-circle img-responsive"> </div>
-                <div class=" col-md-9 col-lg-9 ">
-                  <table class="table">
-                    <tbody>
-                      <tr>
-                        <td>姓名：</td>
-                        <td>{{row.name}}</td>
-                      </tr>
-                      <tr>
-                        <td>部门：</td>
-                        <td>{{row.f_parentname}}</td>
-                      </tr>
-                      <tr>
-                        <td>工号：</td>
-                        <td>{{row.gonghao}}</td>
-                      </tr>
-                      <tr>
-                        <td>联系电话：</td>
-                        <td>{{row.f_fgsdianhua}}</td>
-                      </tr>
-                      <tr>
-                        <td colspan="2" class="h4">温馨提示：请核对安检员照片和工号，如有疑问，请致电<span class="text-danger">96677</span>。</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                  <button type="button" @click="goBack" class="btn btn-primary">返回</button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </http-busy>
-    <div style="height:50px;"></div>
-    </div>
-</template>
-
-<script>
-import Vue from 'vue'
-
-export default {
-  title: '安检员信息',
-  props: ['userid'],
-  data() {
-    return {
-      row : {},
-    }
-  },
-  computed: {
-      imgsrc() {
-        return Vue.staticUrl + 'db/file/' + this.userid
-      }
-  },
-  methods: {
-    goBack() {
-      this.$back('test')
-    },
-  },
-  ready() {
-    this.$resetpost(Vue.url + 'sql/查找登录用户信息', {data:{userid: this.userid}}, {resolveMsg: null, rejectMsg: null}).then(
-      (response) => {
-        this.$set('row', response.data[0])
-      }
-    ).catch(
-      (response) => {
-        this.$set('row', response.statusText)
-      }
-    )
-  },
-}
-</script>
+<template>
+  <div class="container">
+    <http-busy>
+      <div class="row">
+        <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 col-xs-offset-0 col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad" >
+          <div class="panel panel-info">
+            <div class="panel-heading">
+              <h3 class="panel-title">安检员信息，请仔细核对</h3>
+            </div>
+            <div class="panel-body">
+              <div class="row">
+                <div class="col-md-3 col-lg-3 " align="center"> <img alt="照片" :src="imgsrc" class="img-circle img-responsive"> </div>
+                <div class=" col-md-9 col-lg-9 ">
+                  <table class="table">
+                    <tbody>
+                      <tr>
+                        <td>姓名：</td>
+                        <td>{{row.name}}</td>
+                      </tr>
+                      <tr>
+                        <td>部门：</td>
+                        <td>{{row.f_parentname}}</td>
+                      </tr>
+                      <tr>
+                        <td>工号：</td>
+                        <td>{{row.gonghao}}</td>
+                      </tr>
+                      <tr>
+                        <td>联系电话：</td>
+                        <td>{{row.f_fgsdianhua}}</td>
+                      </tr>
+                      <tr>
+                        <td colspan="2" class="h4">温馨提示：请核对安检员照片和工号，如有疑问，请致电<span class="text-danger">96677</span>。</td>
+                      </tr>
+                    </tbody>
+                  </table>
+                  <button type="button" @click="goBack" class="btn btn-primary">返回</button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </http-busy>
+    <div style="height:50px;"></div>
+    </div>
+</template>
+
+<script>
+import Vue from 'vue'
+
+export default {
+  title: '安检员信息',
+  props: ['userid'],
+  data() {
+    return {
+      row : {},
+    }
+  },
+  computed: {
+      imgsrc() {
+        return Vue.staticUrl + 'db/file/' + this.userid
+      }
+  },
+  methods: {
+    goBack() {
+      this.$back('test')
+    },
+  },
+  ready() {
+    this.$resetpost(Vue.url + 'sql/查找登录用户信息', {data:{userid: this.userid}}, {resolveMsg: null, rejectMsg: null}).then(
+      (response) => {
+        this.$set('row', response.data[0])
+      }
+    ).catch(
+      (response) => {
+        this.$set('row', response.statusText)
+      }
+    )
+  },
+}
+</script>

package/src/components/android/CheckerMonthly.vue

@@ -1,84 +1,84 @@
-<template>
-  <div>
-    <form>
-      <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>
-    </form>
-    <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>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-
-let aggCheckerTask = function * (self) {
-    let result = yield self.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/统计安检员月任务?pageNo=1&pageSize=9999` , {
-        data: {
-            id: Vue.user.id,
-            org_id: Vue.user.parentid,
-            f_plan_year: self.c_plan_year[0],
-            f_plan_month: self.c_plan_month[0],
-            f_subcompany: Vue.user.f_subcompany,
-            f_ym: self.c_plan_year[0] + '-' + (self.c_plan_month[0].length > 1 ? self.c_plan_month[0] : '0' + self.c_plan_month[0])
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取任务出错'
-    })
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '安检员月任务',
-  data() {
-    let options = []
-    let year = (new Date()).getFullYear()
-    options.push({label: year+'', value: year+''})
-    year++
-    options.push({label: year+'', value: year+''})
-    let moptions = []
-    for(let i=1; i<=12; i++)
-      moptions.push({label: i + '', value: i + ''})
-    return {
-      c_plan_year: options[0].value,
-      c_year_list: options,
-      c_month_list: moptions,
-      c_plan_month: moptions[new Date().getMonth()].value,
-      model: {
-        rows: [],
-      }
-    }
-  },
-  ready () {
-    this.search()
-  },
-  methods: {
-    search () {
-      let fp = aggCheckerTask(this)
-      co(fp)
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <form>
+      <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>
+    </form>
+    <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>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+
+let aggCheckerTask = function * (self) {
+    let result = yield self.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/统计安检员月任务?pageNo=1&pageSize=9999` , {
+        data: {
+            id: Vue.user.id,
+            org_id: Vue.user.parentid,
+            f_plan_year: self.c_plan_year[0],
+            f_plan_month: self.c_plan_month[0],
+            f_subcompany: Vue.user.f_subcompany,
+            f_ym: self.c_plan_year[0] + '-' + (self.c_plan_month[0].length > 1 ? self.c_plan_month[0] : '0' + self.c_plan_month[0])
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取任务出错'
+    })
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '安检员月任务',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    options.push({label: year+'', value: year+''})
+    year++
+    options.push({label: year+'', value: year+''})
+    let moptions = []
+    for(let i=1; i<=12; i++)
+      moptions.push({label: i + '', value: i + ''})
+    return {
+      c_plan_year: options[0].value,
+      c_year_list: options,
+      c_month_list: moptions,
+      c_plan_month: moptions[new Date().getMonth()].value,
+      model: {
+        rows: [],
+      }
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    search () {
+      let fp = aggCheckerTask(this)
+      co(fp)
+    }
+  }
+}
+</script>

package/src/components/android/CurrentCreate.vue

@@ -985,7 +985,7 @@
         criteria = {
           items: 'count(id) count',
           tablename: 't_check_plan_item',
-          condition: `(f_complete = '' or f_complete = null or f_complete = '未完成') AND f_state = '已检'`,
+          condition: `(f_complete = '' or f_complete is null or f_complete = '未完成') AND f_state = '已检'`,
           groupitem: 'f_state'
         }
         result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})