bug修复

src/HManagement/addressList/mycontact/index.vue

@@ -6,7 +6,7 @@
       <contacts style="flex:1 0 auto" :data="activeGroupData" @clickContacts="clickContacts" @filtetContacts="filtetContacts"></contacts>
       <detail :activeContactsData="activeContactsData">
         <template v-slot:edit="data">
-          <edit :data="data" :group="group" @onAddSuccess="onAddSuccess"></edit>
+          <edit :data="data" :group="group" @onEditSuccess="onEditSuccess"></edit>
         </template>
         <template v-slot:del="data">
           <ondel :data="data" @onDelSuccess="onDelSuccess"></ondel>
@@ -50,6 +50,10 @@ export default {
         this.activeContactsData = this.activeGroupData.phonebook.filter(e=>{return e.rowindex === this.activeContactsData.rowindex})[0]
       })
     },
+    onEditSuccess (form) {
+      console.log(form)
+      this.activeContactsData = Object.assign({},this.activeGroupData,form)
+    }, 
     setGroupData (val) {
       this.group = val
     },
@@ -65,7 +69,7 @@ export default {
         return e.sys_phonebookid !== id
       })
       this.activeContactsData = null
-      this.$refs['grouplist'].listData()
+      // this.$refs['grouplist'].listData()
     },
     filtetContacts (type,val) {
       if (type === 'name') {

src/HManagement/addressList/mycontact/modules/add.vue

@@ -31,14 +31,16 @@
               <el-date-picker
                 style="width:100%"
                 v-model="form.birthday"
-                value-format="yyyy-mm-dd"
+                value-format="yyyy-MM-dd"
                 type="date"
                 placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="邮箱">
+            <el-form-item label="邮箱" prop="email" :rules="[
+              { pattern:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/, message: '请输入正确邮箱',trigger: 'blur' }
+            ]">
               <el-input v-model="form.email" autocomplete="on" placeholder="输入联系人邮箱"></el-input>
             </el-form-item>
           </el-col>
@@ -47,11 +49,11 @@
               <el-input v-model="form.homeaddress" autocomplete="on" placeholder="输入联系人家庭住址"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="微信">
               <el-input v-model="form.wechat" autocomplete="on" placeholder="输入联系人微信"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="单位">
               <el-input v-model="form.company" autocomplete="on" placeholder="输入联系人单位"></el-input>

src/HManagement/addressList/mycontact/modules/contacts.vue

@@ -3,7 +3,7 @@
     <div class="container" style="border-bottom:1px solid #f1f2f3">
       <el-form class="myform" size="small" inline label-position="left" label-width="50px">
         <el-form-item label="搜索">
-          <el-input v-model="condition" prefix-icon="el-icon-search" placeholder="联系人名称,手机号" @keyup.native.enter="search" @clear="clearSearch" clearable></el-input>
+          <el-input v-model="condition" prefix-icon="el-icon-search" placeholder="联系人,手机号(全称)" @keyup.native.enter="search" @clear="clearSearch" clearable></el-input>
         </el-form-item>
       </el-form>
     </div>

src/HManagement/addressList/mycontact/modules/detail.vue

@@ -20,7 +20,7 @@
         <el-descriptions-item label="姓名">{{activeContactsData.name}}</el-descriptions-item>
         <el-descriptions-item label="手机号">{{activeContactsData.phonenumber}}</el-descriptions-item>
         <el-descriptions-item label="邮箱">{{activeContactsData.email}}</el-descriptions-item>
-        <el-descriptions-item label="微信">{{activeContactsData.wechat}}</el-descriptions-item>
+        <!-- <el-descriptions-item label="微信">{{activeContactsData.wechat}}</el-descriptions-item> -->
         <el-descriptions-item label="性别">{{activeContactsData.sex}}</el-descriptions-item>
         <el-descriptions-item label="单位">{{activeContactsData.company}}</el-descriptions-item>
         <el-descriptions-item label="部门">{{activeContactsData.depname}}</el-descriptions-item>

src/HManagement/addressList/mycontact/modules/edit.vue

@@ -31,14 +31,16 @@
               <el-date-picker
                 style="width:100%"
                 v-model="form.birthday"
-                value-format="yyyy-mm-dd"
+                value-format="yyyy-MM-dd"
                 type="date"
                 placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="邮箱">
+            <el-form-item label="邮箱" prop="email" :rules="[
+              { pattern:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/, message: '请输入正确邮箱',trigger: 'blur' }
+            ]">
               <el-input v-model="form.email" autocomplete="on" placeholder="输入联系人邮箱"></el-input>
             </el-form-item>
           </el-col>
@@ -142,9 +144,7 @@ export default {
           "content": this.form
         })
         this.tool.showMessage(res,()=>{
-          setTimeout(() => {
-            this.$emit('onAddSuccess')
-          }, 500);
+          this.$emit('onEditSuccess',this.form)
           this.dialogFormVisible = false
         })
       });

src/HManagement/marketing/agent/modules/add_agent.vue

@@ -96,7 +96,7 @@ export default {
         "agentnum":"",
         "agentname":"",
         "address":"",
-        "agenttype":"",
+        "agenttype":"经销商",
         "signdate":"",
         "grade":'',
         "sa_saleareaid":'',

src/HManagement/marketing/agent/modules/agent_detail.vue

@@ -29,7 +29,7 @@
       </el-tabs>
     </div>
     <div class="container normal-panel" v-if="activeName === 'first'">
-      <el-button class="normal-margin" type="primary" size="small" @click="createAgentMainUser">创建经销商主账号</el-button>
+      <!-- <el-button class="normal-margin" type="primary" size="small">创建经销商主账号</el-button> -->
       <tableLayout :layout="tablecols" :data="form.hrs" :custom="false" height="300px"></tableLayout>
     </div>
     <div class="container normal-panel" v-if="activeName === 'third'">
@@ -109,7 +109,7 @@ export default {
         res.data[e] !== '' ?res.data.value.push(res.data[e]):''
       })
       this.form = Object.assign({},this.form,res.data)
-      this.$refs.agent.value.agentname = res.data.parentagentname      
+      // this.$refs.agent.value.agentname = res.data.parentagentname      
     },
     async query_arealist() {
       const res = await this.$api.requested({

src/HManagement/marketing/agent/modules/edit_agent.vue

@@ -122,7 +122,7 @@ export default {
         "agentnum":"",
         "agentname":"",
         "address":"",
-        "agenttype":"",
+        "agenttype":"经销商",
         "signdate":"",
         "grade":'',
         "sa_saleareaid":'',

yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.5d9ee505.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.46bc510f.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.0b479049.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.1b7194d6.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>