safecheck-client 3.0.34-6 → 3.0.34-61

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/LcheckUnplan.vue

@@ -1,108 +1,108 @@
-<template>
-  <div class="app-bg auto">
-    <tools-page :need-back='true' title="安检计划"  @back="back()"></tools-page>
-      <div class="row app-input">
-        <label class="col-xs-4 control-label text-left">用户编号</label>
-        <input class="col-xs-8" v-model="model.f_userid" placeholder="请输入用户编号">
-      </div>
-      <div class="row app-input">
-        <label class="col-xs-4 control-label text-left">用户姓名</label>
-        <input class="col-xs-8" v-model="model.f_username" placeholder="请输入用户姓名">
-      </div>
-      <div class="row app-input">
-        <label class="col-xs-4 control-label text-left">表号</label>
-          <input class="col-xs-8" v-model="model.f_meter_no" placeholder="请输入表编号">
-      </div>
-      <div class="row app-input">
-        <label class="col-xs-4 control-label text-left">卡号</label>
-        <input class="col-xs-6" v-model="model.f_cardid" placeholder="请输入用户卡号">
-        <div class="input-group col-xs-2">
-          <span class="input-group-btn">
-            <button class="btn btn-default " type="button" @click="readCard">读卡</button>
-          </span>
-        </div>
-      </div>
-      <div class="row app-input">
-        <label class="col-xs-4 control-label text-left">地址</label>
-        <input class="col-xs-8" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
-      </div>
-      <div class="row app-btn" style="margin-bottom: -5px;">
-        <button class="btn btn-primary col-xs-6" @click= "planinfomation()"><span class="glyphicon glyphicon-zoom-in" style="margin-right: 20px;"></span>查询</button>
-      </div>
-
-    <div v-for='row in user' class="app-list auto " @click= "checkplan(row)">
-      <div class="row" style="color: #00B9F1;">
-        <span class="col-xs-3">户号：</span><span class="col-xs-3">{{row.f_userid}}</span>
-        <span class="col-xs-3">姓名：</span><span class="col-xs-3">{{row.f_username}}</span>
-      </div>
-      <div class="row">
-        <span class="col-xs-3">表号：</span><span class="col-xs-3">{{row.f_meter_no}}</span>
-        <span class="col-xs-3">用户类型：</span><span class="col-xs-3">{{row.f_user_type}}</span>
-      </div>
-      <div class="row">
-        <span class="col-xs-3">地址：</span><span class="col-xs-8">{{row.f_address}}</span>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-
-export default {
-  title:'抄表用户信息',
-  data () {
-    return {
-      model: {
-        f_userid:'',
-        f_username: '',
-        f_meter_no: '',
-        f_cardid: '',
-        f_address: ''
-      },
-      //拿到的用户
-      user: [],
-      context: '',
-      // 未上传成功的数据
-      result: []
-    }
-  },
-  methods: {
-    // 读取卡号
-    readCard () {
-      let card = this.$androidUtil.read()
-      this.model.f_cardid = card.msg.CardID
-    },
-    //头部事件回掉
-    back () {
-      this.$back()
-    },
-    //根据条件拿到用户
-    planinfomation () {
-      // 只能自己拼接输入条件
-      let condition = '1=1'
-      for (var key in this.model) {
-        if (this.model[key] !== '') {
-          condition  = condition + ` and ${key} like '%${this.model[key]}%'`
-        }
-      }
-      let url = `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`
-      this.$resetpost(url,
-        {data: {tablename: 't_userfiles',condition: condition}},
-        { resolveMsg: null, rejectMsg: null }
-      ).then((back) => {
-        this.user = back.data
-      }).catch((reason) => {
-        this.$showMessage(`没有该用户，请在营业厅核查, 原因: ${reason}`)
-      })
-    },
-    checkplan(row) {
-      this.$goto("tableset",{user:row})
-    }
-  }
-}
-</script>
-<style>
-
-</style>
+<template>
+  <div class="app-bg auto">
+    <tools-page :need-back='true' title="安检计划"  @back="back()"></tools-page>
+      <div class="row app-input">
+        <label class="col-xs-4 control-label text-left">用户编号</label>
+        <input class="col-xs-8" v-model="model.f_userid" placeholder="请输入用户编号">
+      </div>
+      <div class="row app-input">
+        <label class="col-xs-4 control-label text-left">用户姓名</label>
+        <input class="col-xs-8" v-model="model.f_username" placeholder="请输入用户姓名">
+      </div>
+      <div class="row app-input">
+        <label class="col-xs-4 control-label text-left">表号</label>
+          <input class="col-xs-8" v-model="model.f_meter_no" placeholder="请输入表编号">
+      </div>
+      <div class="row app-input">
+        <label class="col-xs-4 control-label text-left">卡号</label>
+        <input class="col-xs-6" v-model="model.f_cardid" placeholder="请输入用户卡号">
+        <div class="input-group col-xs-2">
+          <span class="input-group-btn">
+            <button class="btn btn-default " type="button" @click="readCard">读卡</button>
+          </span>
+        </div>
+      </div>
+      <div class="row app-input">
+        <label class="col-xs-4 control-label text-left">地址</label>
+        <input class="col-xs-8" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
+      </div>
+      <div class="row app-btn" style="margin-bottom: -5px;">
+        <button class="btn btn-primary col-xs-6" @click= "planinfomation()"><span class="glyphicon glyphicon-zoom-in" style="margin-right: 20px;"></span>查询</button>
+      </div>
+
+    <div v-for='row in user' class="app-list auto " @click= "checkplan(row)">
+      <div class="row" style="color: #00B9F1;">
+        <span class="col-xs-3">户号：</span><span class="col-xs-3">{{row.f_userid}}</span>
+        <span class="col-xs-3">姓名：</span><span class="col-xs-3">{{row.f_username}}</span>
+      </div>
+      <div class="row">
+        <span class="col-xs-3">表号：</span><span class="col-xs-3">{{row.f_meter_no}}</span>
+        <span class="col-xs-3">用户类型：</span><span class="col-xs-3">{{row.f_user_type}}</span>
+      </div>
+      <div class="row">
+        <span class="col-xs-3">地址：</span><span class="col-xs-8">{{row.f_address}}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+
+export default {
+  title:'抄表用户信息',
+  data () {
+    return {
+      model: {
+        f_userid:'',
+        f_username: '',
+        f_meter_no: '',
+        f_cardid: '',
+        f_address: ''
+      },
+      //拿到的用户
+      user: [],
+      context: '',
+      // 未上传成功的数据
+      result: []
+    }
+  },
+  methods: {
+    // 读取卡号
+    readCard () {
+      let card = this.$androidUtil.read()
+      this.model.f_cardid = card.msg.CardID
+    },
+    //头部事件回掉
+    back () {
+      this.$back()
+    },
+    //根据条件拿到用户
+    planinfomation () {
+      // 只能自己拼接输入条件
+      let condition = '1=1'
+      for (var key in this.model) {
+        if (this.model[key] !== '') {
+          condition  = condition + ` and ${key} like '%${this.model[key]}%'`
+        }
+      }
+      let url = `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`
+      this.$resetpost(url,
+        {data: {tablename: 't_userfiles',condition: condition}},
+        { resolveMsg: null, rejectMsg: null }
+      ).then((back) => {
+        this.user = back.data
+      }).catch((reason) => {
+        this.$showMessage(`没有该用户，请在营业厅核查, 原因: ${reason}`)
+      })
+    },
+    checkplan(row) {
+      this.$goto("tableset",{user:row})
+    }
+  }
+}
+</script>
+<style>
+
+</style>

package/src/components/android/PaperFeedback.vue

@@ -315,6 +315,21 @@
       <button  type="button" name="button" class="col-sm-3 btn btn-primary" @click="deletecancel()">取消</button>
     </div>
   </modal>
+  <modal :show.sync="showgas && showgasmodel" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        用户须知
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row" style="margin-top: 6px">
+        <sapn>{{ gasinstructions ? gasinstructions : '请配置用户须知' }}</sapn>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="closeshowgas()">确认</button>
+    </div>
+  </modal>
 </template>
 
 <script>
@@ -496,6 +511,9 @@ export default {
       showmodel: false,
       showbacklist:'是',
       backlistisselect: false,
+      showgas: false,
+      showgasmodel:this.$appdata.getSingleValue('用户须知查看') || false,
+      gasinstructions:'',
       deletebacklistisselect: false,
       radios: [
         {
@@ -1114,6 +1132,9 @@ export default {
       }
 
     },
+    closeshowgas() {
+      this.showgas = false
+    },
     //确认安检转维修
 
     undo() {
@@ -1291,6 +1312,13 @@ export default {
       this.$set('style__', '')
       this.$set('style_view_', '')
     }
+    if (Vue.config.safecheck != undefined) {
+      if (Vue.config.safecheck.ApproveConfig != undefined) {
+        if (Vue.config.safecheck.ApproveConfig.gasinstructions != undefined) {
+          this.gasinstructions = Vue.config.safecheck.ApproveConfig.gasinstructions
+        }
+      }
+    }
 
     for (let item of this.radios) {
       if (this.paper.f_client_evaluation == item.label) {
@@ -1381,6 +1409,11 @@ export default {
     '$parent.$parent.isUpload'(val) {
       ////tag
     },
+    'paper.f_read_instructions'(val) {
+      if (val == true) {
+        this.showgas = true
+      }
+    },
     'meading'(val) {
       ////tag
       this.$parent.$parent.meading = val