system-clients 3.2.72-yc-1 → 3.2.72-yc-3

package/src/plugins/GetLoginInfoService.js

@@ -25,8 +25,10 @@ let loginGen = async function (name, password, cue) {
 
     // 兼容旧版ldao，旧版不返回code
     if ((JSON.stringify(resource.data).startsWith("{") || JSON.stringify(resource.data).startsWith("[")) && resource.data.code && resource.data.msg) {
+      resource.data.data.orgstr="榆林."+ resource.data.data.orgs
       Vue.$login.f = resource.data.data
     } else {
+      resource.data.orgstr="榆林."+ resource.data.orgs
       Vue.$login.f = resource.data
     }
     // 把登录用户添加到cookie里

package/src/plugins/validation.js

@@ -1,15 +1,15 @@
-import Vue from 'vue'
-import Validator from 'vue-validator'
-Vue.use(Validator)
-//密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
-Vue.validator('strongpassword', function (val) {
-  return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
-});
-Vue.validator('chinesePassword', function (val) {
-  var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
-  return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
-});
-// 潜能要求8~16位数字字母组合；
-Vue.validator('numbersAndLetter8to16', function (val) {
-  return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(.)(\1)+)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(val)
-});
+import Vue from 'vue'
+import Validator from 'vue-validator'
+Vue.use(Validator)
+//密码强度验证器(必须为为大小写字母、阿拉伯数字、字符)
+Vue.validator('strongpassword', function (val) {
+  return /^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
+});
+Vue.validator('chinesePassword', function (val) {
+  var testBealoon=/.*?[\u4E00-\u9FFF]+.*$/.test(val)
+  return !(/.*?[\u4E00-\u9FFF]+.*$/.test(val))
+});
+// 潜能要求8~16位数字字母组合；
+Vue.validator('numbersAndLetter8to16', function (val) {
+  return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(.)(\1)+)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(val)
+});

package/src/stores/AppData.js

@@ -1,38 +1,38 @@
-import Vue from 'vue'
-
-let GetAppDataService = {
-  install(Vue, options) {
-    // 给vue增添对话框显示方法
-
-    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
-  },
-
-  // 开启卡监听
-  load () {
-    return Vue.resetpost('rs/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        res.data.singleValues.forEach((item) => {
-          this.singleValues[item.name] = item.value
-        })
-        res.data.params.forEach((item) => {
-          let value = []
-          item.f_paramvalues.forEach((item, index) => {
-            value[index] = {}
-            value[index].label = item.name
-            value[index].value = item.name
-          })
-          this.params[item.name] = value
-        })
-    })
-  },
-
-  params: {},
-  singleValues: {},
-
-  getParam(key) {
-    return this.params[key] || []
-  },
-  getSingleValue(key) {
-    return this.singleValues[key]
-  }
-}
-export default GetAppDataService
+import Vue from 'vue'
+
+let GetAppDataService = {
+  install(Vue, options) {
+    // 给vue增添对话框显示方法
+
+    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
+  },
+
+  // 开启卡监听
+  load () {
+    return Vue.resetpost('rs/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        res.data.singleValues.forEach((item) => {
+          this.singleValues[item.name] = item.value
+        })
+        res.data.params.forEach((item) => {
+          let value = []
+          item.f_paramvalues.forEach((item, index) => {
+            value[index] = {}
+            value[index].label = item.name
+            value[index].value = item.name
+          })
+          this.params[item.name] = value
+        })
+    })
+  },
+
+  params: {},
+  singleValues: {},
+
+  getParam(key) {
+    return this.params[key] || []
+  },
+  getSingleValue(key) {
+    return this.singleValues[key]
+  }
+}
+export default GetAppDataService