safecheck-client 3.0.33-99 → 3.0.34-1

package/src/components/paper/PlanChooser.vue

@@ -1,167 +1,167 @@
-<template>
-  <div>
-    <form class="form-inline">
-      <div class="row form-group">
-        <div class="col-sm-4">
-        <label class="font_normal_body" for="c_plan_year">计划年份:</label>
-        <v-select id="c_plan_year" :value.sync="c_plan_year"
-                  class="select_list select"
-                  :width="'55%'"
-                  style="width: 55%"
-                  :options='c_year_list' close-on-select clear-button></v-select>
-        </div>
-        <div class="col-sm-4">
-        <label class="font_normal_body" for="c_plan_month">计划月份:</label>
-        <v-select id="c_plan_month" :value.sync="c_plan_month"
-                  class="select_list select"
-                  :width="'55%'"
-                  style="width: 55%"
-                  :options='c_month_list' close-on-select clear-button></v-select>
-        </div>
-        <div class="col-sm-4">
-        <label class="font_normal_body">安检人员:</label>
-        <v-select id="checker" :value.sync="model.f_checker_id" placeholder='安检员'
-                  :value-single="true"
-                  class="select_list select"
-                  :width="'55%'"
-                  style="width: 55%"
-                  :options='checkers' close-on-select clear-button> </v-select>
-        </div>
-      </div>
-      <div class="row form-group">
-      <!--<div style="width: 65%;height:100%; display: inline-block">-->
-        <div class="col-sm-4">
-          <label class="font_normal_body">是否共享:</label>
-          <v-select id="share" :value.sync="model.f_is_share" placeholder='是否共享'
-                    :value-single="true"
-                    class="select_list select"
-                    :width="'55%'"
-                    style="width: 55%"
-                    :options='shares' close-on-select clear-button> </v-select>
-        </div>
-
-        <div class="col-sm-4">
-          <label class="font_normal_body">计划名称:</label>
-          <input type="text" class="input_search" v-model="model.f_plan_name"
-                 style="width: 60%" placeholder="计划名称" condition="f_plan_name like '%{}%'">
-        </div>
-        <div class="col-sm-4">
-          <button type="button" class="button_search" @click="search()">查询</button>
-        </div>
-      </div>
-    </form>
-    <hr>
-    <table class="table table_sy">
-      <thead>
-      <tr>
-        <th></th>
-        <th>计划名称</th>
-        <th>计划类型</th>
-      </tr>
-      </thead>
-      <tbody>
-      <tr v-for="row in model.rows">
-        <td @click="select(row, $index)">{{row.selected ? '☆' : ''}}</td>
-        <td @click="select(row, $index)">{{row.f_plan_name}}</td>
-        <td @click="select(row, $index)">{{row.f_plan_type}}</td>
-      </tr>
-      </tbody>
-    </table>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import Vue from 'vue'
-  import co from 'co'
-  import { HttpResetClass } from 'vue-client'
-
-  let selectnew = function * (self) {
-    let http = new HttpResetClass()
-    http.load('POST', '/rs/search', {
-        data:{
-          source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
-          userid: self.$login.f.orgid
-        }
-      }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      self.checkers = []
-      let arr = []
-      //tag
-      res.data.forEach((resRow) => {
-        if(!arr.includes(resRow.name) &&  resRow.state == '在职'){
-          arr.push(resRow.name)
-          self.checkers.push({label:resRow.name,value:resRow.id})
-        }
-      })
-      self.checkers.push({label:'全部',value:''})
-    })
-  }
-
-
-  export default {
-    title: '选择安检计划',
-    props: ['f'],
-    data() {
-      let options = []
-      let year = (new Date()).getFullYear()
-      for(let i = year - 8; i <= year +1; i++ )
-        options.push({label: i+'', value: i+''})
-      let moptions = []
-      for(let i=1; i<=12; i++)
-        moptions.push({label: i + '', value: i + ''})
-      let model = new PagedList('rs/sql/按年月人员提取安检计划', 20,
-        {f_subcompany:'this.f_subcompany',f_plan_name:'this.f_plan_name',f_checker_id: 'this.f_checker_id', f_plan_year: 'this.f_plan_year', f_plan_month: 'this.f_plan_month', f_is_share: 'this.f_is_share',f_filialeid:'this.f_filialeid'})
-      model.f_checker_id = ''
-      model.f_plan_name=''
-      model.f_filialeid = this.$login.f.orgid
-      return {
-        checker:'',
-        checkers:[],
-        shares: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
-        c_plan_year: [year + ''],
-        c_year_list: options,
-        c_month_list: moptions,
-        c_plan_month: [moptions[new Date().getMonth()].value],
-        model: model,
-        selectedRow: {}
-      }
-    },
-    ready () {
-      this.model.f_plan_year = this.c_plan_year[0]
-      this.model.f_plan_month = this.c_plan_month[0]
-      this.model.f_subcompany = this.$login.f.orgid
-      //tag
-      //tag
-      //tag
-      this.model.f_plan_name=''
-      let gen = selectnew(this)
-      return co(gen)
-    },
-    watch: {
-      'c_plan_year' (val) {
-        this.model.f_plan_year = val[0]
-      },
-      'c_plan_month' (val) {
-        this.model.f_plan_month = val[0]
-      },
-      'checker'(){
-        //tag
-        this.selectedRow = {}
-      }
-    },
-    methods: {
-      search () {
-        //this.model.rows = []
-        this.model.rows = []
-        this.model.search()
-      },
-      select(row, idx) {
-        if(this.selectedRow)
-          this.$set('model.rows[' + this.selectedRow.idx + '].selected', false)
-        this.selectedRow = row
-        this.selectedRow.idx = idx
-        this.$set('model.rows[' + idx + '].selected', true)
-      }
-    }
-  }
-</script>
+<template>
+  <div>
+    <form class="form-inline">
+      <div class="row form-group">
+        <div class="col-sm-4">
+        <label class="font_normal_body" for="c_plan_year">计划年份:</label>
+        <v-select id="c_plan_year" :value.sync="c_plan_year"
+                  class="select_list select"
+                  :width="'55%'"
+                  style="width: 55%"
+                  :options='c_year_list' close-on-select clear-button></v-select>
+        </div>
+        <div class="col-sm-4">
+        <label class="font_normal_body" for="c_plan_month">计划月份:</label>
+        <v-select id="c_plan_month" :value.sync="c_plan_month"
+                  class="select_list select"
+                  :width="'55%'"
+                  style="width: 55%"
+                  :options='c_month_list' close-on-select clear-button></v-select>
+        </div>
+        <div class="col-sm-4">
+        <label class="font_normal_body">安检人员:</label>
+        <v-select id="checker" :value.sync="model.f_checker_id" placeholder='安检员'
+                  :value-single="true"
+                  class="select_list select"
+                  :width="'55%'"
+                  style="width: 55%"
+                  :options='checkers' close-on-select clear-button> </v-select>
+        </div>
+      </div>
+      <div class="row form-group">
+      <!--<div style="width: 65%;height:100%; display: inline-block">-->
+        <div class="col-sm-4">
+          <label class="font_normal_body">是否共享:</label>
+          <v-select id="share" :value.sync="model.f_is_share" placeholder='是否共享'
+                    :value-single="true"
+                    class="select_list select"
+                    :width="'55%'"
+                    style="width: 55%"
+                    :options='shares' close-on-select clear-button> </v-select>
+        </div>
+
+        <div class="col-sm-4">
+          <label class="font_normal_body">计划名称:</label>
+          <input type="text" class="input_search" v-model="model.f_plan_name"
+                 style="width: 60%" placeholder="计划名称" condition="f_plan_name like '%{}%'">
+        </div>
+        <div class="col-sm-4">
+          <button type="button" class="button_search" @click="search()">查询</button>
+        </div>
+      </div>
+    </form>
+    <hr>
+    <table class="table table_sy">
+      <thead>
+      <tr>
+        <th></th>
+        <th>计划名称</th>
+        <th>计划类型</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr v-for="row in model.rows">
+        <td @click="select(row, $index)">{{row.selected ? '☆' : ''}}</td>
+        <td @click="select(row, $index)">{{row.f_plan_name}}</td>
+        <td @click="select(row, $index)">{{row.f_plan_type}}</td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import co from 'co'
+  import { HttpResetClass } from 'vue-client'
+
+  let selectnew = function * (self) {
+    let http = new HttpResetClass()
+    http.load('POST', '/rs/search', {
+        data:{
+          source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+          userid: self.$login.f.orgid
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      self.checkers = []
+      let arr = []
+      //tag
+      res.data.forEach((resRow) => {
+        if(!arr.includes(resRow.name) &&  resRow.state == '在职'){
+          arr.push(resRow.name)
+          self.checkers.push({label:resRow.name,value:resRow.id})
+        }
+      })
+      self.checkers.push({label:'全部',value:''})
+    })
+  }
+
+
+  export default {
+    title: '选择安检计划',
+    props: ['f'],
+    data() {
+      let options = []
+      let year = (new Date()).getFullYear()
+      for(let i = year - 8; i <= year +1; i++ )
+        options.push({label: i+'', value: i+''})
+      let moptions = []
+      for(let i=1; i<=12; i++)
+        moptions.push({label: i + '', value: i + ''})
+      let model = new PagedList('rs/sql/按年月人员提取安检计划', 20,
+        {f_subcompany:'this.f_subcompany',f_plan_name:'this.f_plan_name',f_checker_id: 'this.f_checker_id', f_plan_year: 'this.f_plan_year', f_plan_month: 'this.f_plan_month', f_is_share: 'this.f_is_share',f_filialeid:'this.f_filialeid'})
+      model.f_checker_id = ''
+      model.f_plan_name=''
+      model.f_filialeid = this.$login.f.orgid
+      return {
+        checker:'',
+        checkers:[],
+        shares: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
+        c_plan_year: [year + ''],
+        c_year_list: options,
+        c_month_list: moptions,
+        c_plan_month: [moptions[new Date().getMonth()].value],
+        model: model,
+        selectedRow: {}
+      }
+    },
+    ready () {
+      this.model.f_plan_year = this.c_plan_year[0]
+      this.model.f_plan_month = this.c_plan_month[0]
+      this.model.f_subcompany = this.$login.f.orgid
+      //tag
+      //tag
+      //tag
+      this.model.f_plan_name=''
+      let gen = selectnew(this)
+      return co(gen)
+    },
+    watch: {
+      'c_plan_year' (val) {
+        this.model.f_plan_year = val[0]
+      },
+      'c_plan_month' (val) {
+        this.model.f_plan_month = val[0]
+      },
+      'checker'(){
+        //tag
+        this.selectedRow = {}
+      }
+    },
+    methods: {
+      search () {
+        //this.model.rows = []
+        this.model.rows = []
+        this.model.search()
+      },
+      select(row, idx) {
+        if(this.selectedRow)
+          this.$set('model.rows[' + this.selectedRow.idx + '].selected', false)
+        this.selectedRow = row
+        this.selectedRow.idx = idx
+        this.$set('model.rows[' + idx + '].selected', true)
+      }
+    }
+  }
+</script>

package/src/components/paper/RepairVerifyForm.vue

@@ -1,76 +1,76 @@
-<template>
-<div>
-    <validator name='v'>
-        <a href="#" class="btn btn-primary" @click="this.$back('items')">&lt;&lt;</a>
-        <form novalidate class="form-horizontal">
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">审核人：</label>
-                <div class="col-sm-8">
-                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved_by" v-validate:f_repair_approved_by='{ required: true }' />
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">审核结果：</label>
-                <div class="col-sm-8">
-                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved" v-validate:f_repair_approved='{ required: true }' />
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">审核时间：</label>
-                <div class="col-sm-8">
-                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved_time"/>
-                </div>
-            </div>
-            <div class="form-group">
-              <label class="col-sm-2 control-lable">审核备注：</label>
-              <div class="col-sm-8">
-                  <textarea class="form-control" type="text" v-model="item.f_repair_approved_note"></textarea>
-              </div>
-          </div>
-            <div class="form-group col-sm-12">
-              <button :disabled="item.f_repair_approved != '未审核' && item.f_repair_approved != '重修'" type="button" class="btn btn-primary col-sm-3" @click="approve">
-                 <span class="glyphicon glyphicon-ok"></span> 通过
-              </button>
-              <button :disabled="item.f_repair_approved != '未审核' && item.f_repair_approved != '重修'" type="button" class="btn btn-primary col-sm-3" @click="disapprove">
-                 <span class="glyphicon glyphicon-remove"></span> 打回
-              </button>
-            </div>
-        </form>
-    </validator>
-</div>
-
-</template>
-
-<script>
-import * as Util from '../Util'
-import co from 'co'
-import Vue from 'vue'
-
-let syncVerify = function * (self) {
-  yield self.$resetpost('rs/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'})
-}
-
-export default {
-  title: '维修审核',
-  props: ['item', 'name'],
-  ready () {
-    if(this.item.f_repair_approved == '未审核') {
-      this.item.f_repair_approved_time = Util.toStandardTimeString()
-      this.item.f_repair_approved_by = this.name
-    }
-  },
-  methods: {
-    approve () {
-      this.item.f_repair_approved = '已审核'
-      let gen = syncVerify(this)
-      return co(gen)
-    },
-    disapprove () {
-      this.item.f_repair_approved = '打回'
-      let gen = syncVerify(this)
-      return co(gen)
-    },
-  }
-}
-
-</script>
+<template>
+<div>
+    <validator name='v'>
+        <a href="#" class="btn btn-primary" @click="this.$back('items')">&lt;&lt;</a>
+        <form novalidate class="form-horizontal">
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">审核人：</label>
+                <div class="col-sm-8">
+                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved_by" v-validate:f_repair_approved_by='{ required: true }' />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">审核结果：</label>
+                <div class="col-sm-8">
+                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved" v-validate:f_repair_approved='{ required: true }' />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">审核时间：</label>
+                <div class="col-sm-8">
+                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved_time"/>
+                </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-2 control-lable">审核备注：</label>
+              <div class="col-sm-8">
+                  <textarea class="form-control" type="text" v-model="item.f_repair_approved_note"></textarea>
+              </div>
+          </div>
+            <div class="form-group col-sm-12">
+              <button :disabled="item.f_repair_approved != '未审核' && item.f_repair_approved != '重修'" type="button" class="btn btn-primary col-sm-3" @click="approve">
+                 <span class="glyphicon glyphicon-ok"></span> 通过
+              </button>
+              <button :disabled="item.f_repair_approved != '未审核' && item.f_repair_approved != '重修'" type="button" class="btn btn-primary col-sm-3" @click="disapprove">
+                 <span class="glyphicon glyphicon-remove"></span> 打回
+              </button>
+            </div>
+        </form>
+    </validator>
+</div>
+
+</template>
+
+<script>
+import * as Util from '../Util'
+import co from 'co'
+import Vue from 'vue'
+
+let syncVerify = function * (self) {
+  yield self.$resetpost('rs/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'})
+}
+
+export default {
+  title: '维修审核',
+  props: ['item', 'name'],
+  ready () {
+    if(this.item.f_repair_approved == '未审核') {
+      this.item.f_repair_approved_time = Util.toStandardTimeString()
+      this.item.f_repair_approved_by = this.name
+    }
+  },
+  methods: {
+    approve () {
+      this.item.f_repair_approved = '已审核'
+      let gen = syncVerify(this)
+      return co(gen)
+    },
+    disapprove () {
+      this.item.f_repair_approved = '打回'
+      let gen = syncVerify(this)
+      return co(gen)
+    },
+  }
+}
+
+</script>

package/src/components/pc/NewCheckpaper.vue

@@ -894,6 +894,7 @@ import Vue from 'vue'
 import * as Util from '../Util'
 import {jsonSort} from '../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
+import {forEach} from "mocha/lib/utils";
 
 let asyncReady = async function (self) {
   // 获取配置信息
@@ -1293,6 +1294,9 @@ export default {
       if (this.deviceCollects.length > 0) {
         this.hasDevice = true
       }
+      this.deviceconfig2 = this.deviceconfig2.filter(row => {
+        return !(row.checkname == '$configProp' || row.checkname == '$globalProp');
+      })
       this.ajresult = JSON.parse(this.data.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
       this.showimg5 = this.data.f_noanswer1_path
@@ -1873,18 +1877,17 @@ export default {
               //tag
               //tag)
               console.log('Vue.config.safecheck.DevicesConfig', Vue.config.safecheck.DevicesConfig)
-              if (this.data.f_check_type == '民用') {
-                this.deviceconfig = Vue.config.safecheck.DevicesConfig
-                if (typeof this.deviceconfig === 'string') {
-                  this.deviceconfig = JSON.parse(this.deviceconfig)
-                }
-                //tag)
-              } else if (this.data.f_check_type == '非民用') {
+              // 如果没有用户类型 默认按民用配置走
+              if (this.data.f_check_type == '非民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesSetConfig
                 if (typeof this.deviceconfig === 'string') {
                   this.deviceconfig = JSON.parse(this.deviceconfig)
                 }
-                //tag)
+              }else{
+                  this.deviceconfig = Vue.config.safecheck.DevicesConfig
+                  if (typeof this.deviceconfig === 'string') {
+                    this.deviceconfig = JSON.parse(this.deviceconfig)
+                  }
               }
               if (this.data.f_collection_type == '按金额') {
                 if (this.deviceconfig["燃气表"]){

package/src/components/phonestate/DailyTraffic.vue

@@ -1,57 +1,57 @@
-<template>
-  <div>
-      <div class="auto">
-        <label>{{f_user_name}}日流量列表</label>
-        <button type="button" class="btn btn-default" @click="this.$back('asd')">&lt;&lt;</button>
-      </div>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>日期</th>
-            <th>流量Mb</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td>{{row.f_datetime}}</td>
-          <td>{{row.f_traffic}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import * as Util from '../Util'
-import co from 'co'
-
-let fetchDailyTrafficList = function * (self) {
-    let result = yield self.$post('rs/sql/日流量明细?pageNo=1&pageSize=9999', {
-        data: {
-            f_userinfoid: self.f_userinfoid,
-            f_user_name: self.f_user_name,
-            f_ym: self.f_ym
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取任务出错'
-    })
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '日流量明细',
-  props: ['f_userinfoid', 'f_user_name', 'f_ym'],
-  data() {
-    return {
-      model: {
-        rows: []
-      }
-    }
-  },
-  ready () {
-    let fp = fetchDailyTrafficList(this)
-    co(fp)
-  }
-}
-</script>
+<template>
+  <div>
+      <div class="auto">
+        <label>{{f_user_name}}日流量列表</label>
+        <button type="button" class="btn btn-default" @click="this.$back('asd')">&lt;&lt;</button>
+      </div>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>日期</th>
+            <th>流量Mb</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_datetime}}</td>
+          <td>{{row.f_traffic}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import * as Util from '../Util'
+import co from 'co'
+
+let fetchDailyTrafficList = function * (self) {
+    let result = yield self.$post('rs/sql/日流量明细?pageNo=1&pageSize=9999', {
+        data: {
+            f_userinfoid: self.f_userinfoid,
+            f_user_name: self.f_user_name,
+            f_ym: self.f_ym
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取任务出错'
+    })
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '日流量明细',
+  props: ['f_userinfoid', 'f_user_name', 'f_ym'],
+  data() {
+    return {
+      model: {
+        rows: []
+      }
+    }
+  },
+  ready () {
+    let fp = fetchDailyTrafficList(this)
+    co(fp)
+  }
+}
+</script>