2022-7-19

src/SManagement/orderclue/components/add.vue

@@ -44,20 +44,6 @@
 export default {
   name: 'add',
   data() {
-    let phoneCheck = (rule,value,callback) => {
-      if(!this.tool.checkPhoneFun(value)) {
-        callback(new Error('请输入正确手机号'))
-      }else {
-        callback()
-      }
-    }
-    let checkLength = (rule,value,callback) => {
-      if(value && value.length > 25) {
-        callback(new Error('字符限制在25个之内'))
-      }else {
-        callback()
-      }
-    }
     return {
       param: {
         "classname": "saletool.orderclue.web.orderclue",
@@ -78,14 +64,14 @@ export default {
       rules: {
         phonenumber:[
           {required:true,message:'请输入手机号',trigger:'blur'},
-          {validator:phoneCheck,trigger:'blur'}
+          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ],
         province:[
           {required:true,message:'内容不能为空',trigger:'blur'},
         ],
         cluesource:[
           {required:true,message:'内容不能为空',trigger:'blur'},
-          {validator:checkLength,trigger:'blur'}
+          { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }
         ],
       },
       arealist:[],
@@ -132,13 +118,12 @@ export default {
             type:'warning'
           })
           this.$api.requested(this.param).then( res => {
-            if(res.code == 1) {
-              this.$refs.ruleForm.resetFields()
-              this.dialogVisible = false  
-              this.areaSelectResult = []
-              this.$emit('updataList')
-              this.tool.showMessage(res)
-            }
+              this.tool.showMessage(res,() => {
+                this.$refs.ruleForm.resetFields()
+                this.dialogVisible = false  
+                this.areaSelectResult = []
+                this.$emit('updataList')
+              })
           })
       })
       

src/SManagement/orderclue/components/edit.vue

@@ -50,20 +50,6 @@ import { log } from '@antv/g2plot/lib/utils';
 export default {
   name: 'add',
   data() {
-    let phoneCheck = (rule,value,callback) => {
-      if(!this.tool.checkPhoneFun(value)) {
-        callback(new Error('请输入正确手机号'))
-      }else {
-        callback()
-      }
-    }
-    let checkLength = (rule,value,callback) => {
-      if(value && value.length > 25) {
-        callback(new Error('字符限制在25个之内'))
-      }else {
-        callback()
-      }
-    }
     return {
       param: {
         "classname": "saletool.orderclue.web.orderclue",
@@ -84,14 +70,14 @@ export default {
       rules: {
         phonenumber:[
           {required:true,message:'请输入手机号',trigger:'blur'},
-          {validator:phoneCheck,trigger:'blur'}
+          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ],
         province:[
           {required:true,message:'内容不能为空',trigger:'blur'},
         ],
         cluesource:[
           {required:true,message:'内容不能为空',trigger:'blur'},
-          {validator:checkLength,trigger:'blur'}
+          { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }
         ],
       },
       arealist:[],
@@ -167,12 +153,13 @@ export default {
           type:'warning'
         })
         this.$api.requested(this.param).then( res => {
-          this.tool.showMessage(res)
-          this.$refs.ruleForm.resetFields()
-          this.dialogVisible = false  
-          this.areaSelectResult = []
-          this.$emit('updataList')
-          this.$emit('getDetail')
+          this.tool.showMessage(res,() => {
+            this.$refs.ruleForm.resetFields()
+            this.dialogVisible = false  
+            this.areaSelectResult = []
+            this.$emit('updataList')
+            this.$emit('getDetail')
+          })
         })
       })
       

src/SManagement/orderclue/components/export.vue

@@ -26,9 +26,9 @@ export default {
   methods:{
     submit () {
       this.$api.requested(this.param).then( res => {
-        if( res.code == 1) {
+        this.tool.showMessage(res,() => {
           window.open(res.data[0].url,'_self')
-        }
+        })
       })
     }
   }

src/SManagement/orderclue/components/follow.vue

@@ -29,7 +29,7 @@
             <el-form-item label="本次跟进结果" label-width="150px" label-position="left" prop="logtype">
               <el-radio-group v-model="param.content.logtype">
                 <el-radio label="跟进">跟进</el-radio>
-                <el-radio label="成交">成交</el-radio>
+                <el-radio label="已成交">成交</el-radio>
                 <el-radio label="丢单">丢单</el-radio>
                 <el-radio label="无效">无效</el-radio>
               </el-radio-group>
@@ -47,7 +47,7 @@
             <el-form-item label="丢单原因" prop="content" v-if="param.content.logtype == '丢单'">
               <el-input type="textarea" v-model="param.content.content" size="small"></el-input>
             </el-form-item>
-            <el-form-item label="添加备注" prop="content" v-if="param.content.logtype == '成交'">
+            <el-form-item label="添加备注" prop="content" v-if="param.content.logtype == '已成交'">
               <el-input type="textarea" v-model="param.content.content" size="small"></el-input>
             </el-form-item>
             <el-form-item label="无效原因" prop="content" v-if="param.content.logtype == '无效'">

src/SManagement/orderclue/components/list.vue

@@ -72,6 +72,7 @@ export default {
         "method": "selectList",
         "content": {
           "isAll": false,
+          "nocache":true,
           "pageNumber": 1,
           "pageSize": 20,
           "where": {

src/SManagement/orderclue/components/move.vue

@@ -2,7 +2,7 @@
   <div class="move">
     <el-button type="warning" size="small" style="margin-left:10px" @click="dialogVisible=true" v-if="type == 'more'">批量转移</el-button>
     <p @click="dialogVisible=true" v-else>转移</p>
-    <el-dialog title="新建线索" :visible.sync="dialogVisible" width="500px" :before-close="handleClose">
+    <el-dialog title="转移" :visible.sync="dialogVisible" width="500px" :before-close="handleClose">
       <div class="handle">
         <p class="title">团队成员</p>
         <el-select placeholder="请选择转移人" v-model="param.content.sa_agent_hrid" size="small">

src/SManagement/user/team-manage/components/AddUser.vue

@@ -46,13 +46,6 @@
 export default {
   name: 'AddUser',
   data () {
-    let checkPhone = (rule,value,callback) => {
-      if(!this.tool.checkPhoneFun(value)) {
-        return callback(new Error('请填写正确的手机号'))
-      } else {
-        callback()
-      }
-    }
     return {
       param: {
           "classname": "sale.team.team",
@@ -73,7 +66,7 @@ export default {
         ],
         phonenumber: [
           { required: true, message: '请输入手机号', trigger: 'blur' },
-          { validator: checkPhone , trigger: 'blur' }
+          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ],
         roleids: [
           { required: true, message: '请选择你的权限', trigger: 'blur' }

src/SManagement/user/user-info/components/PhoneEdit.vue

@@ -28,13 +28,6 @@ import md5 from 'js-md5'
 export default {
   name: 'PhoneEdit',
   data() {
-    let checkPhone = (rule,value,callback) => {
-      if(!this.tool.checkPhoneFun(value)) {
-        return callback(new Error('请填写正确的手机号'))
-      } else {
-        callback()
-      }
-    }
     return {
       dialogVisible: false,
       form: {
@@ -45,7 +38,7 @@ export default {
       rules: {
         phonenumber:[
           { required: true, message: '请输入手机号', trigger: 'blur' },
-          { validator: checkPhone , trigger: 'blur' }
+          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ]
       }
     };

src/router/index.js

@@ -63,7 +63,7 @@ let routes = [
 routes[2].children = [...routes[2].children,...HManagement,...SManagement]
 
 const router = new VueRouter({
-  mode: 'history',
+  mode: 'hash',
   base: process.env.BASE_URL,
   routes,
 });

src/utils/tool.js

@@ -92,9 +92,5 @@ export default {
       const data = formatJson(filterVal, list);
       export_json_to_excel(tHeader, data, d);  //导出Excel 文件名
     })
-  },
-  //手机正则
-  checkPhoneFun(num) {
-    return /^[1][3-9][\d]{9}/.test(num)
   }
 }