system-clients 3.2.93 → 3.2.94-tongchuan

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Aug 03 14:29:00 CST 2023
+gradle.version=7.4

package/package.json

@@ -1,105 +1,105 @@
-{
-  "name": "system-clients",
-  "version": "3.2.93",
-  "description": "系统基础框架",
-  "main": "src/index.js",
-  "directories": {
-    "doc": "doc",
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
-    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
-  },
-  "dependencies": {
-    "base64-js": "^1.3.0",
-    "js-base64": "^2.4.9",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "nyc": "^15.1.0",
-    "src": "^1.1.2",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "^3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "manage-client": "^1.4.20",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.145-1",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aotu/System"
-  },
-  "keywords": [
-    "system_clients"
-  ],
-  "author": "杨文宇",
-  "license": "ISC"
-}
+{
+  "name": "system-clients",
+  "version": "3.2.94-tongchuan",
+  "description": "系统基础框架",
+  "main": "src/index.js",
+  "directories": {
+    "doc": "doc",
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
+    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
+  },
+  "dependencies": {
+    "base64-js": "^1.3.0",
+    "js-base64": "^2.4.9",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "nyc": "^15.1.0",
+    "src": "^1.1.2",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "^3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "manage-client": "^1.4.20",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.107-test",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aotu/System"
+  },
+  "keywords": [
+    "system_clients"
+  ],
+  "author": "杨文宇",
+  "license": "ISC"
+}

package/src/components/Main.vue

@@ -189,7 +189,6 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
-  // todo v4
   let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
@@ -259,6 +258,7 @@ let createWaterMark = function (userName) {
         qrCode:false,
         isManger: false,
         show: false,
+        orgpathnames: `${this.$login.f.orgs}-${this.$login.f.deps}-${this.$login.f.name}`,
         systemname: '客服系统',
         date: this.$login.toStandardDateString(),
         tabs: [],       //已初始化页签数组
@@ -321,7 +321,9 @@ let createWaterMark = function (userName) {
       // 			}
       this.changeShow()
       const istelRemindTimes =this.$appdata.getSingleValue("是否开启工单提醒定时器")
+      this.getDaiBan()
       if(istelRemindTimes=='是'){
+        this.getOrderList()
         this.getTimesgotoWorkOrderSite()
       }
       const isapplyRemind =this.$appdata.getSingleValue("是否开启提醒")
@@ -470,6 +472,7 @@ let createWaterMark = function (userName) {
                 res.data.forEach(itre => {
                   let band = null
                   if ('f_dynamic_expire' in itre) {
+                      console.log(itre.f_dynamic_expire)
                       if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
                         let todayold =  new Date(itre.f_dynamic_expire)
                         todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
@@ -599,28 +602,13 @@ let createWaterMark = function (userName) {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          // todo v4
-          try {
-            await this.$resetget('api/af-system/user/logout', {resolveMsg: '退出成功', rejectMsg: null})
-          }catch(e){
-          }
+          await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }
       })
     }
   },
   computed: {
-    orgpathnames(){
-      let names = this.$login.f.name
-      if(this.$login.f.deps){
-          names = `${this.$login.f.deps}-${names}`
-      }
-      if(this.$login.f.orgs){
-          names = `${this.$login.f.orgs}-${names}`
-      }
-      return names
-    },
-
     nowDate() {
       return this.$login.getNowDate()
     }

package/src/components/Util.js

@@ -76,6 +76,20 @@ export function parse3339String (strDate) {
     strDate.substr(11, 2), strDate.substr(14, 2), strDate.substr(17, 2)
   )
 }
+// 判断密码最后修改时间是否超过两个半月（2个月零15天）
+export function isPasswordModificationExpired (lastModificationTime) {
+  if (!lastModificationTime) {
+    return true
+  }
+  const lastMod = parse3339String(lastModificationTime)
+  if (isNaN(lastMod.getTime())) {
+    return true
+  }
+  const expireDate = new Date(lastMod)
+  expireDate.setMonth(expireDate.getMonth() + 2)
+  expireDate.setDate(expireDate.getDate() + 15)
+  return new Date() > expireDate
+}
 
 export function format3339TimeString (dt) {
   let month = dt.getMonth() + 1

package/src/components/equipment/EquipmentManage.vue

@@ -1,83 +1,83 @@
-<template>
-  <div class="flex">
-    <div class="auto">
-      <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
-        <div class="row">
-          <div class="col-sm-2 form-group">
-            <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
-            <v-select id="f_charge_type"
-                      v-model="model.f_equipment_type"
-                      placeholder='终端类型'
-                      :value.sync="model.f_equipment_type"
-                      :options='equipmentType'
-                      close-on-select clear-button>
-            </v-select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'PC'">
-      <pc-manage :users="users"></pc-manage>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'POS'">
-      <pos-manage></pos-manage>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'PHONE'">
-      <phone-manage :users="users"></phone-manage>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  import {HttpResetClass} from "vue-client";
-
-  export default {
-    title: '终端控制',
-    data () {
-      return {
-        filialeNameStr: this.$login.f.f_fengongsi,
-        filialeCodeStr: this.$login.f.orgid,
-        userid:this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        equipmentType: this.$appdata.getParam('终端类型'),
-        users:[],
-        model: {
-            f_equipment_type: []
-        }
-      }
-    },
-    ready () {
-      console.log('看看终端类型',  this.equipmentType)
-      this.model.f_equipment_type = [this.equipmentType[0].value]
-      this.getUser()
-    },
-    methods: {
-      del (row) {
-          console.log('要删除了', row)
-      },
-      getUser(){
-        new HttpResetClass().load('POST', '/rs/search', {
-          "source": " this.getParentByType($organization$).getAllChildrens().where(row.getAttributes().get($resourcetype$).indexOf($user$) != -1))",
-          "userid": this.$login.f.id
-        }, {resolveMsg: null, rejectMsg: null}).then((res)=>{
-          this.users=[]
-          let ids=[]
-          res.data.forEach((resRow) => {
-            if(resRow.state=='在职' && !ids.includes(resRow.id+'_'+resRow.name)){
-              ids.push(resRow.id+'_'+resRow.name)
-              this.users.push({label:resRow.name,value:{id:resRow.id,name:resRow.name}})
-            }
-          })
-        })
-      },
-      getRes (obj) {
-        this.filialeNameStr = obj.res
-        this.filialeCodeStr = obj.resids
-      },
-    },
-    computed: {
-
-    }
-  }
-</script>
+<template>
+  <div class="flex">
+    <div class="auto">
+      <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
+        <div class="row">
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
+            <v-select id="f_charge_type"
+                      v-model="model.f_equipment_type"
+                      placeholder='终端类型'
+                      :value.sync="model.f_equipment_type"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PC'">
+      <pc-manage :users="users"></pc-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'POS'">
+      <pos-manage></pos-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PHONE'">
+      <phone-manage :users="users"></phone-manage>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  import {HttpResetClass} from "vue-client";
+
+  export default {
+    title: '终端控制',
+    data () {
+      return {
+        filialeNameStr: this.$login.f.f_fengongsi,
+        filialeCodeStr: this.$login.f.orgid,
+        userid:this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        equipmentType: this.$appdata.getParam('终端类型'),
+        users:[],
+        model: {
+            f_equipment_type: []
+        }
+      }
+    },
+    ready () {
+      console.log('看看终端类型',  this.equipmentType)
+      this.model.f_equipment_type = [this.equipmentType[0].value]
+      this.getUser()
+    },
+    methods: {
+      del (row) {
+          console.log('要删除了', row)
+      },
+      getUser(){
+        new HttpResetClass().load('POST', '/rs/search', {
+          "source": " this.getParentByType($organization$).getAllChildrens().where(row.getAttributes().get($resourcetype$).indexOf($user$) != -1))",
+          "userid": this.$login.f.id
+        }, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          this.users=[]
+          let ids=[]
+          res.data.forEach((resRow) => {
+            if(resRow.state=='在职' && !ids.includes(resRow.id+'_'+resRow.name)){
+              ids.push(resRow.id+'_'+resRow.name)
+              this.users.push({label:resRow.name,value:{id:resRow.id,name:resRow.name}})
+            }
+          })
+        })
+      },
+      getRes (obj) {
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
+      },
+    },
+    computed: {
+
+    }
+  }
+</script>