system-clients 3.2.1-26 → 3.2.1-27

package/.eslintrc.js

@@ -1,16 +1,16 @@
-// module.exports = {
-//   root: true,
-//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-//   extends: 'standard',
-//   // required to lint *.vue files
-//   plugins: [
-//     'eslint-plugin-html'
-//   ],
-//   // add your custom rules here
-//   'rules': {
-//     // allow paren-less arrow functions
-//     'arrow-parens': 0,
-//     // allow debugger during development
-//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-//   }
-// }
+// module.exports = {
+//   root: true,
+//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+//   extends: 'standard',
+//   // required to lint *.vue files
+//   plugins: [
+//     'eslint-plugin-html'
+//   ],
+//   // add your custom rules here
+//   'rules': {
+//     // allow paren-less arrow functions
+//     'arrow-parens': 0,
+//     // allow debugger during development
+//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+//   }
+// }

package/SystemClient.iml

@@ -1,2 +1,9 @@
 <?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" type="JAVA_MODULE" version="4" />
+<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/build/webpack.base.conf.js

@@ -1,85 +1,85 @@
-var path = require('path')
-var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
-
-module.exports = {
-  entry: {
-    app: './src/main.js'
-  },
-  output: {
-    path: path.resolve(__dirname, '../dist/mergeUser'),
-    publicPath: 'mergeUser/',
-    filename: '[name].js'
-  },
-  resolve: {
-    extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
-    alias: {
-      'src': path.resolve(__dirname, '../src'),
-      'test': path.resolve(__dirname, '../test')
-    }
-  },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel',
-        include: [
-          /src/,
-          /build/,
-          /examples/,
-          /test/,
-          /node_modules\/vue-client\/src/,
-          /node_modules\/vue-strap\/src/,
-          /node_modules\/system-clients\/src/,
-          /node_modules\/ldap-clients\/src/,
-          /node_modules\/address-client\/src/
-        ],
-        options: {
-          presets: ['es2015']
-        }
-      },
-      {
-        test: /\.json$/,
-        loader: 'json'
-      },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
-      {
-        test: /\.less$/,
-        loader: 'style!css!less'
-      },
-      {
-        test: /\.css$/,
-        loader: 'style!css'
-      },
-      {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
-        loader: 'url',
-        query: {
-          limit: 10000,
-          name: '[name].[ext]?[hash:7]'
-        }
-      }
-    ]
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: false,
-      extract: false
-    })
-  },
-  plugins: [],
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  }
-}
+var path = require('path')
+var cssLoaders = require('./css-loaders')
+var projectRoot = path.resolve(__dirname, '../')
+
+module.exports = {
+  entry: {
+    app: './src/main.js'
+  },
+  output: {
+    path: path.resolve(__dirname, '../dist/mergeUser'),
+    publicPath: 'mergeUser/',
+    filename: '[name].js'
+  },
+  resolve: {
+    extensions: ['', '.js', '.vue'],
+    fallback: [path.join(__dirname, '../node_modules')],
+    alias: {
+      'src': path.resolve(__dirname, '../src'),
+      'test': path.resolve(__dirname, '../test')
+    }
+  },
+  resolveLoader: {
+    fallback: [path.join(__dirname, '../node_modules')]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        include: [
+          /src/,
+          /build/,
+          /examples/,
+          /test/,
+          /node_modules\/vue-client\/src/,
+          /node_modules\/vue-strap\/src/,
+          /node_modules\/system-clients\/src/,
+          /node_modules\/ldap-clients\/src/,
+          /node_modules\/address-client\/src/
+        ],
+        options: {
+          presets: ['es2015']
+        }
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
+      {
+        test: /\.html$/,
+        loader: 'vue-html'
+      },
+      {
+        test: /\.less$/,
+        loader: 'style!css!less'
+      },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
+      {
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        loader: 'url',
+        query: {
+          limit: 10000,
+          name: '[name].[ext]?[hash:7]'
+        }
+      }
+    ]
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: false,
+      extract: false
+    })
+  },
+  plugins: [],
+  eslint: {
+    formatter: require('eslint-friendly-formatter')
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.1-26",
+  "version": "3.2.1-27",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/App.vue

@@ -1,24 +1,24 @@
-<template>
-  <app-base class="bg">
-    <div class='flex'>
-      <article>
-        <!--<route :comp="{name: 'check-model'}"></route>-->
-        <!--<route :comp="{name: 'vender-management'}"></route>-->
-        <route :comp="{name: 'login'}"></route>
-        <!-- <route :comp="{name: 'load-data'}"></route> -->
-        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
-        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-      </article>
-    </div>
-  </app-base>
-</template>
-
-<script>
-// import cardListen from './plugins/CardListen'
-
-export default {
-  // ready () {
-  //   cardListen.startListen()
-  // }
-}
-</script>
+<template>
+  <app-base class="bg">
+    <div class='flex'>
+      <article>
+        <!--<route :comp="{name: 'check-model'}"></route>-->
+        <!--<route :comp="{name: 'vender-management'}"></route>-->
+        <route :comp="{name: 'login'}"></route>
+        <!-- <route :comp="{name: 'load-data'}"></route> -->
+        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
+        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+      </article>
+    </div>
+  </app-base>
+</template>
+
+<script>
+// import cardListen from './plugins/CardListen'
+
+export default {
+  // ready () {
+  //   cardListen.startListen()
+  // }
+}
+</script>

package/src/components/Main.vue

@@ -1,5 +1,8 @@
 <template>
   <div @click="hindsetting1()" :class="{'with-watermark':showwatermakeflag}">
+    <span class="newTip" transition="newTip"  @click="tipClick"  v-if="newTipShow">
+     <span>您有一条新提醒</span>
+    </span>
     <!--    <div class="system-main" id="box" v-el:box v-if="!isManger">-->
     <!--      <div class="system-logo" style="height: auto">-->
     <!--        <img :src="imgs.logoimg" alt=""/>-->
@@ -111,6 +114,26 @@
     <div v-show="isManger">
       <route v-ref:route></route>
     </div>
+    <modal v-if="newTipContextShow" :show.sync="newTipContextShow" :backdrop="false">
+      <header slot="modal-header" style="display:none"> </header>
+      <article slot="modal-body" class="modal-body">
+        <form class="form-horizontal">
+          <div class="row">
+            <div class="col-sm-12 " v-if="AppDaiBan !==''">
+              <label class="col-sm-2">报装待办:</label>
+              <span style="font-weight:normal">{{AppDaiBan}}</span>
+            </div>
+            <div class="col-sm-12 " v-if="OrderDaiBan !==''">
+              <label class="col-sm-2">预约待办:</label>
+              <span style="font-weight:normal">{{OrderDaiBan}}</span>
+            </div>
+          </div>
+        </form>
+      </article>
+      <footer  slot="modal-footer" style="height: 8vh" class="modal-footer">
+        <button class="button_search" @click="newTipContextShow = false">确认</button>
+      </footer>
+    </modal>
 
     <!-- 变更录入 模态框 -->
     <add-changemsg :show="AddChangeMsgShow" v-on:toggle="AddChangeMsgShow = false"></add-changemsg>
@@ -174,9 +197,15 @@ window.onbeforeunload = () => {
 }
 export default {
   title: '主界面',
-  props: ['functions', 'userid'],
+  props: ['functions', 'userid', 'config'],
   data() {
     return {
+      // 页面提示信息定时器
+      interval: null,
+      newTipShow: false,
+      newTipContextShow: false,
+      AppDaiBan: '',
+      OrderDaiBan: '',
       // 左侧树下部三个小图标
       imgs: {
         open: '/images/lefticon/菜单伸缩.png',
@@ -207,7 +236,7 @@ export default {
     getwartermakr(this);
     let component = this.$login.getUrlCompileParames('component')
     if (component) {
-      // this.isManger = true
+      this.isManger = true
       this.$refs.route.init(component, {data: this.functions.functions})
     }
     if (this.$login.f.password == '1') {
@@ -249,8 +278,74 @@ export default {
     // 			}
     this.changeShow()
     this.gotoWorkOrderSite()
+    // 获取预约列表
+    this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
   },
   methods: {
+    getOrderList(){
+      let times = this.config.times * 60 * 1000
+      console.log("=定时提示间隔=", times)
+      try {
+        this.interval = setInterval(() => {
+          this.getDaiBan()
+        }, times)
+      } catch (error) {
+        console.log('捕获到异常', error)
+      }
+    },
+    async getDaiBan(){
+      this.OrderDaiBan  = ''
+      this.AppDaiBan  = ''
+      let http = new HttpResetClass()
+      await http.load('POST', '/rs/sql/singleTable', {data: {
+          tablename:'t_order_center',
+          condition:` f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and ( f_orderstate != '预约失败'  or f_orderstate is null )`
+        }}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let OrderDaiBan = {}
+        res.data.forEach(item=>{
+          OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
+          OrderDaiBan[item.f_ordertype].push(item)
+        })
+        if (res.data.length> 0){
+          this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
+        }
+      })
+      let data = {
+        condition: '1 = 1',
+        data: {
+          orgid: this.$login.f.orgid,
+          id: this.$login.f.id
+        }
+      }
+      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let AppDaiBan = {}
+        res.data.forEach(item=>{
+          AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
+          AppDaiBan[item.defname].push(item)
+        })
+        if (res.data.length> 0){
+          this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
+          this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
+        }
+      }).catch((e)=>{
+        console.error(e)
+      })
+      if(this.AppDaiBan || this.OrderDaiBan){
+        this.newTipShow = true
+      }
+    },
+    // 提醒框被点击
+    tipClick(){
+      this.newTipShow = false
+      this.newTipContextShow = true
+    },
     gotoWorkOrderSite(){
       const isRemind =this.$appdata.getSingleValue("站点工单提醒")
       console.log('站点工单是否提醒',isRemind)
@@ -367,6 +462,32 @@ export default {
 }
 </script>
 <style lang="less">
+.newTip-transition {
+  transition: all .4s ease;
+}
+.newTip-enter, .newTip-leave {
+  height: 0;
+  padding: 0 10px;
+  opacity: 0;
+}
+.newTip a {
+  color: #333;
+}
+.newTip {
+  cursor: pointer;
+  text-align: center;
+  position: absolute;
+  top: 3em;
+  margin: 0 auto;
+  width: 200px;
+  left: 48%;
+  line-height: 2;
+  z-index: 10010;
+  box-shadow: 0 4px 12px rgba(0,0,0,0.38);
+  pointer-events: all;
+  border-radius: 4px;
+  background-color: whitesmoke;
+}
 /* 组件内通用样式 */
 .select-error {
   button {