safecheck-client 4.0.2-4 → 4.0.2-42

package/src/filiale/xinliansihui/pc/PaperVisitMain.vue

@@ -0,0 +1,206 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="col-sm-4 form-group" style="margin: 0">
+                <role-selector-safe
+                  role-name="新安检员"
+                  role-lable="安&nbsp;检&nbsp;员&nbsp;"
+                  @re-res="$parent.$parent.getRes"
+                  :value.sync="model.f_checker_id"
+                  v-model="model.f_checker_id"
+                  condition="f_checker_name = '{}'">
+                </role-selector-safe>
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">用户地址</label>
+                <input type="text" class="input_search" v-model="model.f_address"
+                       style="width: 60%" placeholder="用户地址" condition="f_address like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">开始时间</label>
+                <datepicker
+                  :value.sync="model.f_check_start"
+                  placeholder='开始时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_start"
+                  condition="f_upload_date >=  '{} 00:00:00'">
+                </datepicker>
+             </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">结束时间</label>
+                <datepicker
+                  :value.sync="model.f_check_end"
+                  placeholder='结束时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_end"
+                  condition="f_upload_date <=  '{} 23:59:59'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
+                <export-excel :data="$parent.$parent.searchData"
+                                   :field="$parent.$parent.excelHeaders"
+                                   progress="safeGetExportProgress"
+                                   sqlurl="api/af-safecheck/logic/exportfile" sql-name="queryNoVisit" template-name='到访不遇'></export-excel>
+                <button class="button_spacing button_search" @click="search()">查询</button>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                     @click="$parent.$parent.hidden()"></div>
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">表号</label>
+                <input type="text" class="input_search" v-model="model.f_meternumber"
+                       style="width: 60%" placeholder="表号" condition="f_meternumber like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">客户类型</label>
+                <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.f_check_type' placeholder='客户类型'
+                          close-on-select
+                          condition="f_user_type = '{}'"></v-select>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>客户编号</nobr>
+              </th>
+              <th>
+                <nobr>客户名称</nobr>
+              </th>
+              <th>
+                <nobr>客户电话</nobr>
+              </th>
+              <th>
+                <nobr>表号</nobr>
+              </th>
+              <th>
+                <nobr>用户类型</nobr>
+              </th>
+              <th>
+                <nobr>客户地址</nobr>
+              </th>
+              <th>
+                <nobr>安检员</nobr>
+              </th>
+              <th>
+                <nobr>安检时间</nobr>
+              </th>
+              <th>
+                <nobr>备注</nobr>
+              </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center">{{row.f_userinfoid}}</td>
+            <td style="text-align: center">{{row.f_user_name}}</td>
+            <td style="text-align: center">{{row.f_user_phone}}</td>
+            <td style="text-align: center">{{row.f_meternumber}}</td>
+            <td style="text-align: center">{{row.f_user_type}}</td>
+            <td style="text-align: center">{{row.f_address}}</td>
+            <td style="text-align: center">{{row.f_checker_name}}</td>
+            <td style="text-align: center">{{row.f_upload_date}}</td>
+            <td style="text-align: center">{{row.f_comments}}</td>
+            <td style="text-align: center">
+              <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
+            </td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+    <modal :show.sync="imgshow" v-ref:modal backdrop="true">
+      <header slot="modal-header" class="modal-header">
+        到访照片
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group" style="display: flex">
+          <img-self-plus v-if="imgRow.f_daofang1_path" :src="'rs/image/file/'+imgRow.f_daofang1_path" width="100" height="150"></img-self-plus>
+          <img-self-plus v-if="imgRow.f_daofang2_path" :src="'rs/image/file/'+imgRow.f_daofang2_path" width="100" height="150"></img-self-plus>
+          <img-self-plus v-if="imgRow.f_daofang3_path" :src="'rs/image/file/'+imgRow.f_daofang3_path" width="100" height="150"></img-self-plus>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import * as Util from '../../Util'
+  export default {
+    title: '无计划到访查询',
+    data() {
+      return {
+        imgshow:false,
+        imgRow:{},
+        model: new PagedList('api/af-safecheck/sql/queryNoVisit', 20, {}),
+        excelHeaders: {
+          'f_userinfoid': '客户编号',
+          'f_user_name': '客户名称',
+          'f_user_phone': '客户电话',
+          'f_address': '客户地址',
+          'f_checker_name': '安检员',
+          'f_upload_date': '安检时间',
+          'f_comments': '备注',
+          'f_user_type':'用户类型',
+          'f_meternumber':'表号'
+        },
+        criteriaShow: false,
+        showModal: false,
+        f_check_type:[{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
+
+      }
+    },
+    methods: {
+      getRes(obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
+      },
+      imgclose () {
+        this.imgshow = false
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      change(row){
+        console.log("933",row)
+        this.imgRow = row
+        this.imgshow = true
+      },
+      selfSearch(args) {
+        ////tag
+        this.model.search(args.condition, args.model, args.condValue)
+      }
+    },
+
+    ready() {
+      this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString()
+      this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString()
+    },
+    computed :{
+      searchData() {
+        return {condition: this.model.condition}
+      }
+    },
+    watch: {
+
+    }
+
+  }
+</script>

package/src/filiale/xinliansihui/pc.js

@@ -0,0 +1,13 @@
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  "paper-main":(resolve) => { require(['./pc/PaperList.vue'], resolve) },
+  "paper-visit-main":(resolve) => { require(['./pc/PaperVisitMain'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/plugins/LoadData.js

@@ -1,10 +1,10 @@
-import Vue from 'vue'
-// import AppData from '../stores/AppData'
-
-let getSafeCheckParams = {
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.getSafeCheckParams = Vue.prototype.$getSafeCheckParams = getSafeCheckParams
-  }
-}
-export default getSafeCheckParams
+import Vue from 'vue'
+// import AppData from '../stores/AppData'
+
+let getSafeCheckParams = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.getSafeCheckParams = Vue.prototype.$getSafeCheckParams = getSafeCheckParams
+  }
+}
+export default getSafeCheckParams

package/src/plugins/LoadParams.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-// import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost('rs/path/getParams', {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      res.data.forEach((item) => {
-        let value = []
-        item.f_paramvalues.forEach((item, index) => {
-          value[index] = {}
-          value[index].label = item.name
-          value[index].value = item.name
-        })
-        AppData.params[item.name] = value
-      })
-    }).catch((res) => {
-      this.msg = res.data
-      this.show = true
-    })
-  }
-}
-
-export default LoadParams
+import Vue from 'vue'
+// import AppData from '../stores/AppData'
+
+let LoadParams = {
+    // 开启卡监听
+  load () {
+    return Vue.resetpost('rs/path/getParams', {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        AppData.params[item.name] = value
+      })
+    }).catch((res) => {
+      this.msg = res.data
+      this.show = true
+    })
+  }
+}
+
+export default LoadParams

package/src/safecheck-android.js

@@ -304,6 +304,16 @@ export default function (filiale) {
   Vue.component('phone-other-info', (resolve) => {require(['./components/android/PhoneotherInfo'], resolve)})
   Vue.component('seal-manage', (resolve) => { require(['./components/android/SealManage'], resolve) })
   Vue.component('seal-bind', (resolve) => { require(['./components/android/SealBind'], resolve) })
+  // 首检
+  Vue.component('first-week-check', (resolve) => {require(['./components/android/week/FirstWeekCheck'], resolve)})
+  // 周检项
+  Vue.component('check-rsult-simple', (resolve) => {require(['./components/android/week/CheckResultSimple'], resolve)})
+  // 周检待办
+  Vue.component('week-check', (resolve) => {require(['./components/android/week/WeekCheck'], resolve)})
+  // 周检详情
+  Vue.component('step-header-bar', (resolve) => {require(['./components/android/week/StepHeaderBar'], resolve)})
+  // 周检查看
+  Vue.component('week-check-paper', (resolve) => {require(['./components/android/week/WeekCheckPaper'], resolve)})
   //特殊目录给这里加
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/android`).specialComp

package/src/safecheck.js

@@ -49,6 +49,9 @@ export default function (filiale) {
   Vue.component('paper-main', (resolve) => {
     require(['./components/paper/PaperList'], resolve)
   })
+  Vue.component('safety-Issues-ledger', (resolve) => {
+    require(['./components/paper/safetyledger'], resolve)
+  })
   Vue.component('paper-main-n', (resolve) => {
     require(['./components/safecheckNew/PaperList'], resolve)
   })

package/src/stores/wxconfig.js

@@ -1,10 +1,10 @@
-export default {
-  // 一下为长安呼叫使用云电话地址
-  // tcUrl: 'http://192.169.1.2:9876/Dual'
- /* voiceUrl: 'http://127.0.0.1:9876/Dual',
-  texttUrl: 'http://192.168.2.77:9876/Dual'*/
-  // 一下为咸阳呼叫使用地址
-  // tcUrl: 'http://192.168.2.77:9876/Dual'
-  // tcUrl: 'http://127.0.0.1:9876/Dual'
-  // tcUrl: 'http://192.168.30.28:9876/Dual'
-}
+export default {
+  // 一下为长安呼叫使用云电话地址
+  // tcUrl: 'http://192.169.1.2:9876/Dual'
+ /* voiceUrl: 'http://127.0.0.1:9876/Dual',
+  texttUrl: 'http://192.168.2.77:9876/Dual'*/
+  // 一下为咸阳呼叫使用地址
+  // tcUrl: 'http://192.168.2.77:9876/Dual'
+  // tcUrl: 'http://127.0.0.1:9876/Dual'
+  // tcUrl: 'http://192.168.30.28:9876/Dual'
+}

package/src/utils/getNowDate.js

@@ -1,33 +1,33 @@
-export default () => {
-  // 求取当前时间的工具
-  let myweekday = ''
-  let year = ''
-  let mydate = new Date()
-  myweekday = mydate.getDay()
-  let mymonth = mydate.getMonth() + 1
-  let myday = mydate.getDate()
-  let myyear = mydate.getYear()
-  year = (myyear > 200) ? myyear : 1900 + myyear
-  let weekday = ''
-  if (myweekday === 0) {
-    weekday = '星期日'
-  } else if (myweekday === 1) {
-    weekday = '星期一'
-  } else if (myweekday === 2) {
-    weekday = '星期二'
-  } else if (myweekday === 3) {
-    weekday = '星期三'
-  } else if (myweekday === 4) {
-    weekday = '星期四'
-  } else if (myweekday === 5) {
-    weekday = '星期五'
-  } else if (myweekday === 6) {
-    weekday = '星期日'
-  } else if (myweekday === 7) {
-    weekday = '星期六'
-  }
-
-
-  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
-  return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
-}
+export default () => {
+  // 求取当前时间的工具
+  let myweekday = ''
+  let year = ''
+  let mydate = new Date()
+  myweekday = mydate.getDay()
+  let mymonth = mydate.getMonth() + 1
+  let myday = mydate.getDate()
+  let myyear = mydate.getYear()
+  year = (myyear > 200) ? myyear : 1900 + myyear
+  let weekday = ''
+  if (myweekday === 0) {
+    weekday = '星期日'
+  } else if (myweekday === 1) {
+    weekday = '星期一'
+  } else if (myweekday === 2) {
+    weekday = '星期二'
+  } else if (myweekday === 3) {
+    weekday = '星期三'
+  } else if (myweekday === 4) {
+    weekday = '星期四'
+  } else if (myweekday === 5) {
+    weekday = '星期五'
+  } else if (myweekday === 6) {
+    weekday = '星期日'
+  } else if (myweekday === 7) {
+    weekday = '星期六'
+  }
+
+
+  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
+  return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
+}

package/test/e2e/custom-assertions/elementCount.js

@@ -1,26 +1,26 @@
-// A custom Nightwatch assertion.
-// the name of the method is the filename.
-// can be used in tests like this:
-//
-//   browser.assert.elementCount(selector, count)
-//
-// for how to write custom assertions see
-// http://nightwatchjs.org/guide#writing-custom-assertions
-exports.assertion = function (selector, count) {
-  this.message = 'Testing if element <' + selector + '> has count: ' + count
-  this.expected = count
-  this.pass = function (val) {
-    return val === this.expected
-  }
-  this.value = function (res) {
-    return res.value
-  }
-  this.command = function (cb) {
-    var self = this
-    return this.api.execute(function (selector) {
-      return document.querySelectorAll(selector).length
-    }, [selector], function (res) {
-      cb.call(self, res)
-    })
-  }
-}
+// A custom Nightwatch assertion.
+// the name of the method is the filename.
+// can be used in tests like this:
+//
+//   browser.assert.elementCount(selector, count)
+//
+// for how to write custom assertions see
+// http://nightwatchjs.org/guide#writing-custom-assertions
+exports.assertion = function (selector, count) {
+  this.message = 'Testing if element <' + selector + '> has count: ' + count
+  this.expected = count
+  this.pass = function (val) {
+    return val === this.expected
+  }
+  this.value = function (res) {
+    return res.value
+  }
+  this.command = function (cb) {
+    var self = this
+    return this.api.execute(function (selector) {
+      return document.querySelectorAll(selector).length
+    }, [selector], function (res) {
+      cb.call(self, res)
+    })
+  }
+}

package/test/e2e/nightwatch.conf.js

@@ -1,40 +1,40 @@
-// http://nightwatchjs.org/guide#settings-file
-module.exports = {
-  'src_folders': ['test/e2e/specs'],
-  'output_folder': 'test/e2e/reports',
-  'custom_assertions_path': ['test/e2e/custom-assertions'],
-
-  'selenium': {
-    'start_process': true,
-    'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.52.0.jar',
-    'host': '127.0.0.1',
-    'port': 4444,
-    'cli_args': {
-      'webdriver.chrome.driver': require('chromedriver').path
-    }
-  },
-
-  'test_settings': {
-    'default': {
-      'selenium_port': 4444,
-      'selenium_host': 'localhost',
-      'silent': true
-    },
-
-    'chrome': {
-      'desiredCapabilities': {
-        'browserName': 'chrome',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    },
-
-    'firefox': {
-      'desiredCapabilities': {
-        'browserName': 'firefox',
-        'javascriptEnabled': true,
-        'acceptSslCerts': true
-      }
-    }
-  }
-}
+// http://nightwatchjs.org/guide#settings-file
+module.exports = {
+  'src_folders': ['test/e2e/specs'],
+  'output_folder': 'test/e2e/reports',
+  'custom_assertions_path': ['test/e2e/custom-assertions'],
+
+  'selenium': {
+    'start_process': true,
+    'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.52.0.jar',
+    'host': '127.0.0.1',
+    'port': 4444,
+    'cli_args': {
+      'webdriver.chrome.driver': require('chromedriver').path
+    }
+  },
+
+  'test_settings': {
+    'default': {
+      'selenium_port': 4444,
+      'selenium_host': 'localhost',
+      'silent': true
+    },
+
+    'chrome': {
+      'desiredCapabilities': {
+        'browserName': 'chrome',
+        'javascriptEnabled': true,
+        'acceptSslCerts': true
+      }
+    },
+
+    'firefox': {
+      'desiredCapabilities': {
+        'browserName': 'firefox',
+        'javascriptEnabled': true,
+        'acceptSslCerts': true
+      }
+    }
+  }
+}

package/test/e2e/runner.js

@@ -1,30 +1,30 @@
-// 1. start the dev server
-var server = require('../../build/dev-server.js')
-
-// 2. run the nightwatch test suite against it
-// to run in additional browsers:
-//    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
-//    2. add it to the --env flag below
-// For more information on Nightwatch's config file, see
-// http://nightwatchjs.org/guide#settings-file
-var spawn = require('cross-spawn')
-var runner = spawn(
-  './node_modules/.bin/nightwatch',
-  [
-    '--config', 'test/e2e/nightwatch.conf.js',
-    '--env', 'chrome'
-  ],
-  {
-    stdio: 'inherit'
-  }
-)
-
-runner.on('exit', function (code) {
-  server.close()
-  process.exit(code)
-})
-
-runner.on('error', function (err) {
-  server.close()
-  throw err
-})
+// 1. start the dev server
+var server = require('../../build/dev-server.js')
+
+// 2. run the nightwatch test suite against it
+// to run in additional browsers:
+//    1. add an entry in test/e2e/nightwatch.conf.json under "test_settings"
+//    2. add it to the --env flag below
+// For more information on Nightwatch's config file, see
+// http://nightwatchjs.org/guide#settings-file
+var spawn = require('cross-spawn')
+var runner = spawn(
+  './node_modules/.bin/nightwatch',
+  [
+    '--config', 'test/e2e/nightwatch.conf.js',
+    '--env', 'chrome'
+  ],
+  {
+    stdio: 'inherit'
+  }
+)
+
+runner.on('exit', function (code) {
+  server.close()
+  process.exit(code)
+})
+
+runner.on('error', function (err) {
+  server.close()
+  throw err
+})

package/test/e2e/specs/test.js

@@ -1,13 +1,13 @@
-// For authoring Nightwatch tests, see
-// http://nightwatchjs.org/guide#usage
-
-module.exports = {
-  'default e2e tests': function (browser) {
-    browser
-    .url('http://localhost:8080')
-      .waitForElementVisible('#app', 5000)
-      .assert.elementPresent('.logo')
-      .assert.containsText('h1', 'Hello World!')
-      .end()
-  }
-}
+// For authoring Nightwatch tests, see
+// http://nightwatchjs.org/guide#usage
+
+module.exports = {
+  'default e2e tests': function (browser) {
+    browser
+    .url('http://localhost:8080')
+      .waitForElementVisible('#app', 5000)
+      .assert.elementPresent('.logo')
+      .assert.containsText('h1', 'Hello World!')
+      .end()
+  }
+}

package/test/unit/.eslintrc

@@ -1,5 +1,5 @@
-{
-  "env": {
-    "jasmine": true
-  }
-}
+{
+  "env": {
+    "jasmine": true
+  }
+}