system-clients 3.1.84 → 3.1.85-xianyang

package/src/components/server/ModifyPw.vue

@@ -18,14 +18,13 @@
             </div>
           </div>
           <div class="has-feedback form-group"
-               :class="{'has-warning':$v.newpassword.required,'has-error':$v.newpassword.strongpassword && !($v.newpassword.required),
-          'has-success': !$v.newpassword.required && !$v.newpassword.strongpassword }">
+               :class="{'has-warning':$v.newpassword.required,'has-error':$v.newpassword.required,
+          'has-success': !$v.newpassword.required }">
             <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
             <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, strongpassword: true}'>
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !($v.newpassword.strongpassword && !($v.newpassword.required))"></span>
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required"></span>
               <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="$v.newpassword.strongpassword && !($v.newpassword.required)">密码必须包含英文大小写、阿拉伯数字、字符</span>
             </div>
           </div>
           <div class="has-feedback form-group"

package/src/components/server/ResSelect.vue

@@ -2,7 +2,7 @@
   <v-select :options='resoptions' placeholder='请选择'
             :value.sync="selectres"
             :multiple="isMul"
-            search="true"
+            :search="search"
             :close-on-select="!isMul"
             @change="resChange"
   >
@@ -23,6 +23,10 @@
         type: Boolean,
         default: true
       },
+      search:{
+        type: Boolean,
+        default: true
+      },
       //资源初始化数据
       initresid: {
         type: Array,

package/src/components/server/ResSelectGroup.vue

@@ -114,7 +114,7 @@
         else
           condition = " and f_orgid = " + this.$login.f.orgid;
         if(this.userresid.length > 0){
-          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+          condition += " and f_depname in " + plugin.convertToIn(this.obj.depnames);
         }
         if(ids && ids.length > 0){
           condition += " and f_operatorid in " + plugin.convertToIn(ids);

package/src/components/server/RightTree.vue

@@ -1,6 +1,6 @@
 <template>
   <dropdown :model='model' class="auto" id="res-tree" v-if="!islist" v-el:dropdown :style="{width:width}">
-    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown">
+    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown" style="min-width: 100%;">
       <span class='btn-content' :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ orgnames }}</span>
       <span class="caret"></span>
     </button>
@@ -306,10 +306,9 @@
     text-overflow: ellipsis
   }
   .select-style {
-    border: 0px;
     /*border-bottom: 2px solid #C9CCCF;*/
-    border: 1px solid #93B2D3;
-    border-radius: 0px;
+    border: 1px solid #93B2D3 !important;
+    border-radius: 0px !important;
     color: #555;
   }
 </style>

package/src/plugins/validation.js

@@ -3,5 +3,5 @@ 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)
+  return /^(?:(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(val)
 });

package/src/system.js

@@ -26,11 +26,15 @@ import ResSelectGroup from './components/server/ResSelectGroup'
 //资源选择测试
 import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
-export default function (val) {
+export default function (val,version) {
   //验证码开关赋值
   if(val!=null){
     GetLoginInfoService.Verification=val
   }
+  //版本号赋值
+  if(val!=null){
+    GetLoginInfoService.version=version
+  }
   Vue.use(GetLoginInfoService)
   Vue.use(GetAppDataService)
   Vue.use(HeatGetLoginInfoService)
@@ -75,6 +79,8 @@ export default function (val) {
   Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
   // pos端控制
   Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
+  // pos端控制
+  Vue.component('qc-manage', (resolve) => { require(['./components/equipment/QCManage'], resolve) })
 
   // 材料字典
   Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Mar 13 10:30:51 GMT+08:00 2020
-gradle.version=3.5

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-