Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm into master

src/components/guestManagement/Activity.vue

@@ -417,7 +417,7 @@
                         </div>
                         <div>
                           <p>{{subItem.CustomerFollowUpModel.CreateByStr}}</p>
-                          <p class="font-color-info">{{subItem.UpdateDate}}</p>
+                          <p class="font-color-info">{{subItem.UpdateDateStr}}</p>
                         </div>
                         <div class="tag">
                           <span>{{subItem.CustomerFollowUpModel.FollowUpTypeStr}}</span>
@@ -439,7 +439,7 @@
                               </p>
                             </div>
                           </div>
-                          <p> <span class="font-color-info">下次联系时间：</span> <span>{{subItem.CustomerFollowUpModel.NextContactDate}}</span></p>
+                          <p> <span class="font-color-info">下次联系时间：</span> <span>{{subItem.CustomerFollowUpModel.NextContactDateStr}}</span></p>
                         </div>
                       </div>
                     </div>

src/components/guestManagement/customerInfoBox.vue

@@ -82,8 +82,9 @@
         <p>{{detailsData.SurName + detailsData.Name}}</p>
       </div>
       <div class="right" v-if="!hiddenMenu">
+        {{detailsData.IsCreate}}
         <el-button class="crm-btn query-btn" @click="editCust">编辑</el-button>
-        <el-dropdown @command="handleCommand" style="top: 1px;">
+        <el-dropdown @command="handleCommand" style="top: 1px;" v-if="detailsData.IsCreate==1">
           <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
             <i class="iconfont icongengduo"></i>
           </el-button>
@@ -104,7 +105,7 @@
             <span class="info-lable">创建时间：</span><span>{{detailsData.CreateDate ? detailsData.CreateDate : ''}}</span>
           </el-col>
         </el-row>
- 
+
       </div>
       <div class="content">
         <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -183,9 +184,8 @@
         deep: true,
       },
     },
-    created()
-    {
- 
+    created() {
+
     },
     mounted() {
       let $this = this;
@@ -242,8 +242,7 @@
           this.$emit("transferS", 3);
         } else if (command === "g") {}
       },
-      handleClick(tab, event) {
-      },
+      handleClick(tab, event) {},
       editCust() {
         this.$emit("editCustS", 1);
       },