Merge branch 'wsm' of http://139.196.39.194:9021/chenc/cd-work-flow-web into wsm

src/components/jeecg/JUpload.vue

@@ -172,14 +172,14 @@
         this.$emit('change', path);
       },
       beforeUpload(file){
-        var fileType = file.type;
-        if(fileType===FILE_TYPE_IMG){
-          if(fileType.indexOf('image')<0){
+        var type = file.type;
+        if(this.fileType===FILE_TYPE_IMG){
+          if(type.indexOf('image')<0){
             this.$message.warning('请上传图片');
             return false;
           }
-        }else if(fileType===FILE_TYPE_TXT){
-          if(fileType.indexOf('image')>=0){
+        }else if(this.fileType===FILE_TYPE_TXT){
+          if(type.indexOf('image')>=0){
             this.$message.warning('请上传文件');
             return false;
           }

src/views/oa/modules/EnrollmentModal.vue

@@ -157,12 +157,12 @@
           </a-col>
           <a-col :span="8  ">
             <a-form-item label="签字图片" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload v-decorator="['signature', validatorRules.signature]" :trigger-change="true" :disabled="show"></j-upload>
+              <j-upload v-decorator="['signature', validatorRules.signature]" fileType="image" :trigger-change="true" :disabled="show"></j-upload>
             </a-form-item>
           </a-col>
           <a-col :span="8  ">
             <a-form-item label="附件" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload v-decorator="['attachment', validatorRules.attachment]" :trigger-change="true" :disabled="show"></j-upload>
+              <j-upload v-decorator="['attachment', validatorRules.attachment]" fileType="file" :trigger-change="true" :disabled="show"></j-upload>
             </a-form-item>
           </a-col>
 
@@ -482,19 +482,19 @@
                 if (new RegExp(/^1[3|4|5|7|8|9][0-9]\d{8}$/).test(value)) {
                     // update-end--Author:kangxiaolin  Date:20190826 for：[05] 手机号不支持199号码段--------------------
 
-                    var params = {
-                        tableName: 'sys_user',
-                        fieldName: 'phone',
-                        fieldVal: value,
-                        dataId: this.userId
-                    }
-                    duplicateCheck(params).then(res => {
-                        if (res.success) {
-                            callback()
-                        } else {
-                            callback('手机号已存在!')
-                        }
-                    })
+                    // var params = {
+                    //     tableName: 'sys_user',
+                    //     fieldName: 'phone',
+                    //     fieldVal: value,
+                    //     dataId: this.userId
+                    // }
+                    // duplicateCheck(params).then(res => {
+                    //     if (res.success) {
+                    //         callback()
+                    //     } else {
+                    //         callback('手机号已存在!')
+                    //     }
+                    // })
                 } else {
                     callback('请输入正确格式的手机号码!')
                 }

src/views/oa/modules/MaterialModal.vue

@@ -17,7 +17,12 @@
           <a-input v-decorator="[ 'brand', validatorRules.brand]" placeholder="请输入品牌"></a-input>
         </a-form-item>
         <a-form-item label="类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input v-decorator="[ 'category', validatorRules.category]" placeholder="请输入类别"></a-input>
+          <j-dict-select-tag
+            v-decorator="['category',validatorRules.category]"
+            placeholder="请选择类别"
+            :triggerChange="true"
+            dictCode="material_category"
+          />
         </a-form-item>
         <a-form-item label="规格型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input v-decorator="[ 'model', validatorRules.model]" placeholder="请输入规格型号"></a-input>
@@ -39,10 +44,12 @@
   import { httpAction } from '@/api/manage'
   import pick from 'lodash.pick'
   import { validateDuplicateValue } from '@/utils/util'
+  import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
 
   export default {
     name: "MaterialModal",
     components: { 
+      JDictSelectTag
     },
     data () {
       return {

src/views/system/modules/NewUserModal.vue

@@ -131,12 +131,12 @@
           </a-col>
           <a-col :span="8  ">
             <a-form-item label="签字图片" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload v-decorator="['signature', validatorRules.signature]" :trigger-change="true"></j-upload>
+              <j-upload v-decorator="['signature', validatorRules.signature]" fileType="image" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
           <a-col :span="8  ">
             <a-form-item label="附件" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-upload v-decorator="['attachment', validatorRules.attachment]" :trigger-change="true"></j-upload>
+              <j-upload v-decorator="['attachment', validatorRules.attachment]" fileType="file" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
 
@@ -456,19 +456,19 @@
                 if (new RegExp(/^1[3|4|5|7|8|9][0-9]\d{8}$/).test(value)) {
                     // update-end--Author:kangxiaolin  Date:20190826 for：[05] 手机号不支持199号码段--------------------
 
-                    var params = {
-                        tableName: 'sys_user',
-                        fieldName: 'phone',
-                        fieldVal: value,
-                        dataId: this.userId
-                    }
-                    duplicateCheck(params).then(res => {
-                        if (res.success) {
-                            callback()
-                        } else {
-                            callback('手机号已存在!')
-                        }
-                    })
+                    // var params = {
+                    //     tableName: 'sys_user',
+                    //     fieldName: 'phone',
+                    //     fieldVal: value,
+                    //     dataId: this.userId
+                    // }
+                    // duplicateCheck(params).then(res => {
+                    //     if (res.success) {
+                    //         callback()
+                    //     } else {
+                    //         callback('手机号已存在!')
+                    //     }
+                    // })
                 } else {
                     callback('请输入正确格式的手机号码!')
                 }