Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SupplierIndex.vue

@@ -1371,10 +1371,7 @@ export default {
           let x = this.sysMsgList[i];
           if (x.IMID === item.to) {
             if (x.unread != item.unread) {
-              // console.log(x)
-              // console.log(item)
               tempCount = 1;
-              // this.refreshSysNoteDate()
             }
             x.unread = item.unread;
             x.lastMsgShow = item.lastMsg.text;
@@ -1434,7 +1431,6 @@ export default {
           item.updateTimeShow = util.formatDate(item.updateTime, true);
         }
         if (item.unread > 0) {
-          // console.log(item)
           if (this.unReadMsgId.indexOf(item.lastMsg.idServer) == -1) {
             if (!this.isFirst) {
               this.msgGet(item);
@@ -1446,17 +1442,10 @@ export default {
             this.enterChat(item)
           }
         }
-        // else if(this.currentSession.id && item.lastMsg.sessionId==this.currentSession.id){
-        //   if(item.lastMsg.tip && item.lastMsg.tip=='抖了一下'){
-        //     this.dou()
-        //   }
-        // }
-        // console.log(item.lastMsg)
         return item;
       });
       this.hasNewMsg = tempCount;
       this.isFirstLoad = false;
-      // this.allSsionList = JSON.parse(JSON.stringify(sessionlist));
       return sessionlist;
     },
     sessionId() {
@@ -1536,8 +1525,6 @@ export default {
       }
     };
     document.addEventListener(visibilityChangeEvent, onVisibilityChange);
-    // console.log('initIM',this.firstMenuList.indexOf('IM'))
-    console.log(localStorage,'localStorage');
     if(!localStorage.menu)
       this.$store.dispatch("connect");
     else{
@@ -1546,19 +1533,6 @@ export default {
         this.$store.dispatch("connect");
       }
     }
-    // this.userInfo = this.getLocalStorage();
-    // document.title=this.userInfo.GroupName
-    // if (this.userInfo.Icon != null) {
-    //   this.userInfo.UserPhoto = this.userInfo.Icon;
-    // } else {
-    //   this.userInfo.UserPhoto = "";
-    // }
-
-    // let UserInfo = this.getLocalStorage();
-    // this.userId = UserInfo.EmployeeId;
-    // this.allPartMsg.RB_Group_Id = this.deleteMsg.groupId = this.likeMsg.groupId = this.addDynamicMsg.rB_GroupId = this.dynamicMsg.groupId =
-    //   UserInfo.RB_Group_id;
-    // this.addDynamicMsg.rB_BranchId = UserInfo.RB_Branch_id;
 
     this.getDynamic();
     this.getMyDynamic();
@@ -2046,7 +2020,6 @@ export default {
         let t=0;
         let c=0;
         this.douTimer = setInterval(()=>{
-          // console.log('come in ..........')
           if(t==0)
             this.$refs.resizeBox._data.top=y+2
           if(t==2)
@@ -2118,7 +2091,6 @@ export default {
                 );
                 if (add) {
                   this.msgList.push(x);
-                  // console.log(this.msgList)
                 }
               });
               if (!add) {
@@ -3019,7 +2991,6 @@ export default {
         res => {
           if (res.data.resultCode == 1) {
             this.webAllpartList = res.data.data;
-            console.log(this.webAllpartList,'sssssssssss');
           } else {
           }
         },
@@ -3722,7 +3693,6 @@ export default {
             }
           });
           n.onshow = function() {
-            //console.log("通知显示了！");
           };
           n.onclick = function(e) {
             //可以直接通过实例的方式获取data内自定义的数据
@@ -3734,10 +3704,8 @@ export default {
             n.close();
           };
           n.onclose = function() {
-            //console.log("用户点击关闭");
           };
           n.onerror = function(err) {
-            //console.log("出错了，小伙子在检查一下吧");
             throw err;
           };
           setTimeout(() => {

src/components/dmc/manager/dmcTotalTable.vue

@@ -357,12 +357,22 @@
                             <td style="text-align:right;">备注：</td>
                             <td>
                               <el-input class='mt10' v-model='NumObj.remarkString' type='textarea'></el-input>
-                              <br />
                             </td>
                           </tr>
                           <tr>
                             <td colspan="2">
-                              此备注会现在在组团团控列表.
+                              此备注会带到组团团控列表.
+                            </td>
+                          </tr>
+                           <tr>
+                            <td style="text-align:right;">供应商备注：</td>
+                            <td>
+                              <el-input class='mt10' v-model='NumObj.SupplierRemarks' type='textarea'></el-input>
+                            </td>
+                          </tr>
+                          <tr>
+                            <td colspan="2">
+                              此备注会带到供应商订房查询列表.
                             </td>
                           </tr>
                         </table>
@@ -401,6 +411,9 @@
                   <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"
                     style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}
                   </div>
+                   <div v-show="outItem.StaticsReportList[0].SupplierRemarks!=''" class="colorE95252"
+                    style="padding-top:5px;padding-bottom:4px;">对供应商备注:{{outItem.StaticsReportList[index].SupplierRemarks}}
+                   </div>
                 </div>
               </td>
             </tr>
@@ -446,6 +459,7 @@
           DMCNum: "",
           TCIDs: "",
           remarkString: '',
+          SupplierRemarks:''
         },
         queryCommonData: {
           //公司数据
@@ -487,6 +501,7 @@
         this.NumObj.TCIDs = TCIDs;
         this.NumObj.remarkString = obj.DMCRemark;
         this.NumObj.DMCNum = obj.DMCNum;
+        this.NumObj.SupplierRemarks=obj.SupplierRemarks;
       },
       saveRemark() {
         this.apipost('dmcstatistics_post_SetDMCRemark', this.NumObj, res => {
@@ -642,9 +657,9 @@
         this.currentPage = 1;
       },
       getList() {
-        this.loading = true
+        this.loading = true;
         this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
-          this.loading = false
+          this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
             this.list = res.data.data.pageData.data;