去除团队销售活动量&增员备注修改

b0b131ba · Chao Sun · 87fa7de7 · b0b131ba · b0b131ba · b0b131ba
Commit b0b131ba authored May 25, 2020 by Chao Sun
8 changed files
--- a/src/app/my/my-business-detail/my-business-detail.component.html
+++ b/src/app/my/my-business-detail/my-business-detail.component.html
@@ -183,7 +183,7 @@
        <div class="salesNotice">
          <span>
            <input type="text" class="form-control" [(ngModel)]="opportunityRecordItem.salesNotice"
-              [disabled]="remarkId!=opportunityRecordItem.id" />
+              [disabled]="remarkId!=opportunityRecordItem.id" (blur)="inputBlur()" />
          </span>
          <i *ngIf="remarkId!=opportunityRecordItem.id" class="iconfont icon-bianji"
            (click)="editRemark(opportunityRecordItem.id)"></i>

--- a/src/app/my/my-business-detail/my-business-detail.component.scss
+++ b/src/app/my/my-business-detail/my-business-detail.component.scss
@@ -38,13 +38,12 @@
      line-height: 55px;
      border-radius: 50%;
      position: fixed;
-      right: 10px;
+      left: 42%;
      font-size: 24px;
      color: #fff;
      background: #0767bf;
      text-align: center;
      bottom: 50px;
-      left: 42%;
    }
    .contentDetail {
      margin-top: 15px;
@@ -130,12 +129,12 @@
        line-height: 55px;
        border-radius: 50%;
        position: fixed;
-        right: 10px;
+        right:42%;
        font-size: 24px;
        color: #fff;
        background: #0767bf;
        text-align: center;
-        bottom: 30px;
+        bottom: 50px;
        font-size: 28px;
        // color: #ff5933;
        font-weight: bold;

--- a/src/app/my/my-target/my-target.component.html
+++ b/src/app/my/my-target/my-target.component.html
@@ -5,8 +5,8 @@
      <li (click)="searchType=2;salesTargetQuery(1)" [ngClass]="{selected:searchType===2}">销售活动量</li>
      <li (click)="searchType=5;this.salesTargetQuery(2)" *ngIf="isTeamleader==='1'"
        [ngClass]="{selected:searchType===5}">团队销售目标</li>
-      <li (click)="searchType=6;this.salesTargetQuery(2)" *ngIf="isTeamleader==='1'"
+      <!-- <li (click)="searchType=6;this.salesTargetQuery(2)" *ngIf="isTeamleader==='1'"
-        [ngClass]="{selected:searchType===6}">团队销售活动量</li>
+        [ngClass]="{selected:searchType===6}">团队销售活动量</li> -->
      <li (click)="searchType=3;potentialGoalsQuery();" *ngIf="isTeamleader==='1'"
        [ngClass]="{selected:searchType===3}">
        增员目标</li>
@@ -198,7 +198,7 @@
    </div>
  </div>
-  <div class="content_target" *ngIf="searchType===6">
+  <!-- <div class="content_target" *ngIf="searchType===6">
    <div class="content_target_wrapper">
      <div class="line">
        <i class="iconfont icon-bianji" *ngIf="personalSalesActivityFlag"
@@ -214,6 +214,6 @@
        </div>
      </div>
    </div>
-  </div>
+  </div> -->
 </div>
 <ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast>
\ No newline at end of file
--- a/src/app/my/my-target/my-target.component.scss
+++ b/src/app/my/my-target/my-target.component.scss
@@ -10,7 +10,7 @@ ul li,ol li{
            padding: 10px 2px;
            margin-bottom: 10px;
            float: left;
-            width: 180%;
+            width: 130%;
            overflow: hidden;
            overflow-x: auto;
             li {
@@ -22,7 +22,7 @@ ul li,ol li{
              border-radius: 20px;
              margin: 0px 2px;
              float: left;
-              width: 16%;
+              width: 19%;
              h3{
                font-weight: normal;
                font-size: 16px;

--- a/src/app/my/recruiting-detail/recruiting-detail.component.html
+++ b/src/app/my/recruiting-detail/recruiting-detail.component.html
@@ -101,13 +101,22 @@
  </div>
  <div class="content" *ngIf="selectedId===3;">
    <ul class="recordLists">
-      <li *ngFor="let recruitTrackInfoItem of recruitTrackInfoList">
+      <li *ngFor="let recruitTrackInfoItem of recruitTrackInfoList;index as idx;">
        <div style="display: flex;justify-content: space-between;">
          <div class="updatedAt">
            {{recruitTrackInfoItem.trackTime?recruitTrackInfoItem.trackTime:recruitTrackInfoItem.createAt}}</div>
          <div class="opportunityRecordItem">{{recruitTrackInfoItem.trackStatus}}</div>
        </div>
-        <div class="salesNotice">{{recruitTrackInfoItem.notice}}</div>
+        <div class="salesNotice">
+          <span>
+            <input type="text" class="form-control" [disabled]="remarkId!=recruitTrackInfoItem.trackId"
+              [(ngModel)]="recruitTrackInfoItem.notice" (blur)="inputBlur()">
+          </span>
+          <i *ngIf="remarkId!=recruitTrackInfoItem.trackId" class="iconfont icon-bianji"
+            (click)="editRemark(recruitTrackInfoItem.trackId)"></i>
+          <i *ngIf="remarkId==recruitTrackInfoItem.trackId" class="iconfont icon-save"
+            (click)="addRecruitTrack(recruitTrackInfoItem)"></i>
+        </div>
      </li>
    </ul>
    <div class="add" (click)="this.isShow = true;">

--- a/src/app/my/recruiting-detail/recruiting-detail.component.scss
+++ b/src/app/my/recruiting-detail/recruiting-detail.component.scss
@@ -132,12 +132,12 @@
          line-height: 55px;
          border-radius: 50%;
          position: fixed;
-          right: 10px;
+          left: 42%;
          font-size: 24px;
          color: #fff;
          background: #0767bf;
          text-align: center;
-          bottom: 30px;
+          bottom: 50px;
          font-size: 28px;
          // color: #ff5933;
          font-weight: bold;
@@ -241,6 +241,23 @@
        color: #8a8a8a;
        line-height: 1.1;
        margin-bottom: 5px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      span{
+        width: 85%;
+        .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
+          background-color: #eee;
+          opacity: .5;
+          border: none;
+          outline: none;
+          box-shadow: none;
+          padding-left: 0;
+      }
+      }
+      .iconfont{
+        font-size: 18px;
+      }
      }
    }

--- a/src/app/my/recruiting-detail/recruiting-detail.component.ts
+++ b/src/app/my/recruiting-detail/recruiting-detail.component.ts
@@ -38,6 +38,7 @@ export class RecruitingDetailComponent implements OnInit {
  resourceList: Array<any>;
  trackTime: any;
  status: any;
+  remarkId: any;
  constructor(
    private activateRoute: ActivatedRoute,
    public lifeCommonService: LifeCommonService,
@@ -273,67 +274,74 @@ export class RecruitingDetailComponent implements OnInit {
  }
  //新增增员跟进记录
-  addRecruitTrack() {
+  addRecruitTrack(recruitTrackInfoItem?: any) {
-    const oppDate = new Date(this.trackTime + ' 23:59:59').getTime();
+    let param;
-    const createDate = new Date(this.editRecruiting.createdAt).getTime();
+    if (!recruitTrackInfoItem) {
-    // if (nowDate < oppDate) {
+      const oppDate = new Date(this.trackTime + ' 23:59:59').getTime();
-    //   this.toastDialog = true;
+      const createDate = new Date(this.editRecruiting.createdAt).getTime();
-    //   this.toastInfo = {
+      // if (nowDate < oppDate) {
-    //     status: 1,
+      //   this.toastDialog = true;
-    //     msg: '跟进时间不能大于当前时间！',
+      //   this.toastInfo = {
-    //     timeout: 3000,
+      //     status: 1,
-    //     align: 'center'
+      //     msg: '跟进时间不能大于当前时间！',
-    //   };
+      //     timeout: 3000,
-    //   return;
+      //     align: 'center'
-    // }
+      //   };
-    if (oppDate < createDate) {
+      //   return;
-      this.toastDialog = true;
+      // }
-      this.toastInfo = {
+      if (oppDate < createDate) {
-        status: 1,
+        this.toastDialog = true;
-        msg: '跟进时间不能在增员时间之前！',
+        this.toastInfo = {
-        timeout: 3000,
+          status: 1,
-        align: 'center'
+          msg: '跟进时间不能在增员时间之前！',
-      };
+          timeout: 3000,
-      return;
+          align: 'center'
-    }
+        };
+        return;
-    if (!this.trackStatusId) {
+      }
-      this.toastDialog = true;
+      if (!this.trackStatusId) {
-      this.toastInfo = {
+        this.toastDialog = true;
-        status: 1,
+        this.toastInfo = {
-        msg: '请选择跟进状态！',
+          status: 1,
-        timeout: 3000,
+          msg: '请选择跟进状态！',
-        align: 'center'
+          timeout: 3000,
-      };
+          align: 'center'
-      return;
+        };
-    }
+        return;
-    if (!this.trackTime) {
+      }
-      this.toastDialog = true;
+      if (!this.trackTime) {
-      this.toastInfo = {
+        this.toastDialog = true;
-        status: 1,
+        this.toastInfo = {
-        msg: '跟进时间不能为空！',
+          status: 1,
-        timeout: 3000,
+          msg: '跟进时间不能为空！',
-        align: 'center'
+          timeout: 3000,
-      };
+          align: 'center'
-      return;
+        };
-    }
+        return;
-    const RecruitTrackParam = {
+      }
-      potentialId: this.potentialId,
+      param = {
-      practitionerId: JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'],
+        potentialId: this.potentialId,
-      notice: this.notice,
+        practitionerId: JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'],
-      trackStatusId: this.trackStatusId,
+        notice: this.notice,
-      trackTime: this.trackTime
+        trackStatusId: this.trackStatusId,
+        trackTime: this.trackTime
+      }
+    } else {
+      param = recruitTrackInfoItem;
+      param.potentialId = this.potentialId;
+      param.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
    }
-    this.myService.addRecruitTrack(RecruitTrackParam).subscribe((res) => {
+    this.myService.addRecruitTrack(param).subscribe((res) => {
      if (res['success']) {
        this.toastDialog = true;
        this.toastInfo = {
          status: 1,
-          msg: '保存成功！',
+          msg: recruitTrackInfoItem ? '修改成功！' : '添加成功！',
          timeout: 3000,
          align: 'center'
        };
        this.recruitTrackQuery();
+        this.remarkId = '';
      } else {
        this.toastDialog = true;
        this.toastInfo = {
@@ -380,4 +388,8 @@ export class RecruitingDetailComponent implements OnInit {
      }
    })
  }
+  editRemark(id) {
+    this.remarkId = id
+  }
 }
--- a/src/index.html
+++ b/src/index.html
@@ -51,14 +51,7 @@
  <script src="./assets/LCalendar/LCalendar.js"></script>
  <script src="./assets/laydate/laydate.js"></script>
  <script type="text/javascript">
-    //页面刷新的时候不出现
-    if (window.name == "") {
-      window.name = "isReload"; // 在首次进入页面时我们可以给window.name设置一个固定值
-      initialize();
-    } else if (window.name == "isReload") {
-      let loading = document.getElementById("adv");
-      loading.style.display = 'none';
-    }
    const initialize = function () {
      let loading = document.getElementById("adv");
      loading.style.display = 'block';
@@ -71,7 +64,14 @@
        }
      }
    }
+    //页面刷新的时候不出现
+    if (window.name == "") {
+      window.name = "isReload"; // 在首次进入页面时我们可以给window.name设置一个固定值
+      initialize();
+    } else if (window.name == "isReload") {
+      let loading = document.getElementById("adv");
+      loading.style.display = 'none';
+    }
    //用于去除alert的url
    window.alert = function (name) {
@@ -95,7 +95,6 @@
        }),
        async: false,
        success: function (res) {
-          console.log(res)
          if (res['success']) {
            let content = res['data']['knowledge']['content'];
            $('#content').html(content)