Merge branch 'blueBranch' into testToMerge

src/HManagement/accountManage/modules/add.vue

@@ -21,18 +21,18 @@
                   v-model="visible1"
                   width="500">
                   <searchInput ref="searchInput" :param="pepoleParam" :radio="true" @onSelect="setLeader" @onCancel="visible1 = false"></searchInput>
-                  <el-input type="text" v-model.number="form.phonenumber" size="small" :placeholder="$t('请输入手机号')" slot="reference" @input="phoneChange"></el-input>
+                  <el-input type="text" v-model.number="form.phonenumber" size="small" v-trim :placeholder="$t('请输入手机号')" slot="reference" @input="phoneChange"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t(`账号`)"  prop="accountno">
-                <el-input v-model="form.accountno" :disabled="!!isSelectPhone" autocomplete="off" :placeholder="$t(`账号`)"></el-input>
+                <el-input v-model="form.accountno" :disabled="!!isSelectPhone" autocomplete="off" :placeholder="$t(`账号`)" @blur="handleTrim(form, 'accountno')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t(`用户名称`)"  prop="name">
-                <el-input  v-model="form.name" :disabled="!!isSelectPhone" autocomplete="off" :placeholder="$t(`用户名称`)"></el-input>
+                <el-input  v-model="form.name" :disabled="!!isSelectPhone"  autocomplete="off" :placeholder="$t(`用户名称`)" @blur="handleTrim(form, 'name')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="isSelectPhone">
@@ -220,6 +220,11 @@ export default {
       this.form.usertype = ''
       this.form.roleids = []
     },
+    handleTrim(obj, key) {
+      if (obj[key] && typeof obj[key] === 'string') {
+        obj[key] = obj[key].trim();
+      }
+    },
     onSubmit () {
       this.$refs['form'].validate((valid) => {
         if (!valid) return false

src/HManagement/accountManage/modules/edit.vue

@@ -14,22 +14,22 @@
           <el-form :model="form" :rules="rules" ref="form"  size="small" label-position="right" :label-width="tool.onlyZh('110px')">
             <el-col :span="12">
               <el-form-item :label="$t(`账号`)" prop="accountno">
-                <el-input v-model="form.accountno" readonly autocomplete="off" :placeholder="$t(`账号`)"></el-input>
+                <el-input v-model="form.accountno" readonly autocomplete="off" :placeholder="$t(`账号`)" @blur="handleTrim(form, 'accountno')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t(`手机号码`)"  prop="phonenumber">
-                <el-input v-model="form.phonenumber" autocomplete="off" :placeholder="$t(`请输入手机号码`)"></el-input>
+                <el-input v-model="form.phonenumber" autocomplete="off"  :placeholder="$t(`请输入手机号码`)" @blur="handleTrim(form, 'phonenumber')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t(`用户类型`)" prop="usertypename">
-                <el-input v-model="form.usertypename" readonly autocomplete="off" :placeholder="$t(`用户类型`)"></el-input>
+                <el-input v-model="form.usertypename" readonly autocomplete="off" :placeholder="$t(`用户类型`)" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t(`用户名称`)"  prop="name">
-                <el-input  v-model="form.name" autocomplete="off" :placeholder="$t(`用户名称`)"></el-input>
+                <el-input  v-model="form.name" autocomplete="off" :placeholder="$t(`用户名称`)" @blur="handleTrim(form, 'name')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -113,7 +113,11 @@ export default {
       this.rolelist()
       console.log(this.data,this.form)
     },
-
+    handleTrim(obj, key) {
+      if (obj[key] && typeof obj[key] === 'string') {
+        obj[key] = obj[key].trim();
+      }
+    },
     async rolelist () {
       let param = {
         "classname": "sysmanage.develop.optiontype.optiontype",

src/HManagement/department/staff/detail/modules/createUser.vue

@@ -18,13 +18,13 @@
                     v-model="visible1"
                     width="500">
                   <searchInput ref="searchInput" :param="accountParam" :radio="true" @onSelect="setAccount" @onCancel="visible1 = false"></searchInput>
-                  <el-input type="text" v-model.number="form.phonenumber" size="small" :placeholder="$t('请输入手机号')" slot="reference" @input="phoneChange"></el-input>
+                  <el-input type="text" v-model.number="form.phonenumber" size="small" :placeholder="$t('请输入手机号')" slot="reference" @blur="handleTrim(form, 'phonenumber')" @input="phoneChange"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t(`登录账号`)" :label-width="tool.onlyZh('100px')" prop="accountno">
-                <el-input v-model="form.accountno" :disabled="isShow" autocomplete="off" :placeholder="$t(`登录账号`)"></el-input>
+                <el-input v-model="form.accountno" :disabled="isShow" autocomplete="off" :placeholder="$t(`登录账号`)" @blur="handleTrim(form, 'accountno')" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -173,6 +173,11 @@ export default {
       this.form.accountno = data.accountno
       this.isSelectPhone = data.phonenumber
     },
+    handleTrim(obj, key) {
+      if (obj[key] && typeof obj[key] === 'string') {
+        obj[key] = obj[key].trim();
+      }
+    },
     onClose () {
       this.$refs['form'].resetFields()
     }

src/components/upload/hw_obs_upload.vue

@@ -93,21 +93,23 @@ export default {
     handleChange (file, filelist,type) {
       this.file = file
       this.filelist = filelist
-      console.log(this.filelist,'FILE4444')
+
       if (type != '附件'){
         this.$emit('upload')
       }
       var index = file.raw.name.lastIndexOf(".");
-      var ext = file.name.substr(index + 1);
+      var ext = file.name.substr(index + 1) === 'PDF' ? 'pdf' : file.name.substr(index + 1);
+
       this.params.content.filename = file.raw.name
       this.params.content.filetype = ext
       this.getUploadUrl(file, ext,type)
     },
     toUpload (type) {
-      console.log(this.fileListNew)
+
       this.fileListNew.forEach(file=>{
         let index = file.name.lastIndexOf(".");
-        let ext = file.name.substr(index + 1);
+        let ext = file.name.substr(index + 1) === 'PDF' ? 'pdf' : file.name.substr(index + 1);
+
         this.params.content.filename = file.name
         this.params.content.filetype = ext
         this.getUploadUrl(file, ext,type)