add log

d0e47d33 · 蒋勇 · 0d8d1ba3 · d0e47d33 · d0e47d33 · d0e47d33
Commit d0e47d33 authored Oct 29, 2021 by 蒋勇
9 changed files
--- a/jiaxiya/.vscode/launch.json
+++ b/jiaxiya/.vscode/launch.json
@@ -8,7 +8,7 @@
            "type": "node",
            "request": "launch",
            "name": "Launch Program",
-            "program": "${workspaceFolder}/main.js"
+            "program": "${workspaceFolder}/zhichan/jiaxiya/main.js"
        }
    ]
 }
\ No newline at end of file
--- a/jiaxiya/app/base/controller/impl/transfer/tradetransferCtl.js
+++ b/jiaxiya/app/base/controller/impl/transfer/tradetransferCtl.js
@@ -11,9 +11,25 @@ class TradetransferCtl extends CtlBase {
    super("transfer", CtlBase.getServiceName(TradetransferCtl));
    this.postfile = system.getObject("util.restClient");
  }
+  // {
+  //    tid:"xxxx",
+  //    log:{
+  //       "dateStr":"",
+  //        "timeStr":"",
+  //        "yw":"",
+  //        "content":""
+  //     }
+  //  }
  async track(p,q,req){
    console.log(p)
-    return system.getResultSuccess(p.pushData,"ok");
+    //获取当前日期
+    //获取当前时间
+    p.logdata.log.dateStr=new Date().toLocaleDateString()
+    p.logdata.log.timeStr=new Date().toLocaleTimeString()
+    p.logdata.log.yw=req.session.user.userName
+    let update=await this.service.addTrackLog(p.logdata)
+    return system.getResultSuccess(update,"ok");
  }
  async submit(p, q, req) {
    if (req && req.session && req.session.user) {

--- a/jiaxiya/app/base/db/metadata/bizs/bizjs/mytradetransferdiliver.js
+++ b/jiaxiya/app/base/db/metadata/bizs/bizjs/mytradetransferdiliver.js
@@ -8,7 +8,7 @@ module.exports={
      {"width":"100","label":"买方电话","prop":"mobile","isShowTip":true,"isTmpl":false},
      {"width":"100","label":"尼斯大类","prop":"ncl_one","isShowTip":true,"isTmpl":false},
      {"width":"100","label":"成交价格","prop":"price","isShowTip":true,"isTmpl":false},
-      {"width":"80","label":"沟通记录","prop":"tracks","isShowTip":true,"isTmpl":true,"isOther2":true},
+      {"width":"80","label":"沟通记录","prop":"tracklast","isShowTip":true,"isTmpl":false},
      {"width":"null","label":"操作","name":"null","isShowTip":false,"isTmpl":true,"isBtns":true},
    ]
  },

--- a/jiaxiya/app/base/db/models/transfer/tradetransfer.js
+++ b/jiaxiya/app/base/db/models/transfer/tradetransfer.js
@@ -7,7 +7,7 @@ module.exports = (db, DataTypes) => {
    ali_bizid: DataTypes.STRING,  //'阿里订单号'
    user_name: DataTypes.STRING,  //买家姓名
    mobile: DataTypes.STRING, //买方电话
+    tracklog:DataTypes.STRING, 
    contact_name: DataTypes.STRING, //买家联系人姓名
    contact_mobile: DataTypes.STRING, //联系人联系方式
    contact_email: DataTypes.STRING, //买家联系方式

--- a/jiaxiya/app/base/service/impl/transfer/tradetransferSve.js
+++ b/jiaxiya/app/base/service/impl/transfer/tradetransferSve.js
@@ -486,6 +486,41 @@ class TradetransferService extends ServiceBase {
    return rtn;
  }
+  // {
+  //   "dateStr":"",
+  //   "timeStr":"",
+  //   "yw":"",
+  //   "content":""
+  // }
+  async addTrackLog(obj){
+    var self=this;
+    let tid=obj.tid;//如果是来自租户界面的修改
+    let log=obj.log;
+    let strlog=JSON.stringify(log)
+    return  this.db.transaction(async function (t) {
+      let logupdate=await self.dao.model.findOne({where:{id:tid},transaction:t});
+      if(logupdate.tracklog!=""){
+        strlog+="|"+logupdate.tracklog
+      }
+      await self.dao.model.update({"tracklog":strlog},{where:{id:tid},transaction:t});
+      //调用阿里的接口进行交易记录的上传
+      let obj={
+        ali_bizid: logupdate.ali_bizid,
+        note: log.content
+      }
+      let rn =await self.writecommunicationlog(obj)
+      if(!rn){
+        console.log(logupdate.ali_bizid,"日志到阿里出错....")
+        throw new Error("阿里上传日志错误")
+      }else{
+        console.log(rn)
+      }
+      logupdate=await self.dao.model.findOne({where:{id:tid},transaction:t});
+      return logupdate;
+    });
+  }
  //买卖家沟通记录
  async writecommunicationlog(obj) {
    var obj = {

--- a/jiaxiya/app/config/settings.js
+++ b/jiaxiya/app/config/settings.js
@@ -31,7 +31,8 @@ var settings = {
  },
  channelApiUrl: function () {
    if (this.env == "dev") {
-      return "http://60.205.209.94:4003";
+      return "http://123.57.217.203:19500"
+      //return "http://60.205.209.94:4003";
    } else {
      return "http://zc-channel-service";
    }

--- a/jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.html
+++ b/jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.html
@@ -14,7 +14,7 @@
                    <el-step :title="tr.trackDate" :description="tr.trackContent" v-for="(tr, index) in trackRecords"></el-step>
                </el-steps>
            </div>
-            <el-input type="textarea" :rows="2" placeholder="请输入跟进内容" v-model="trackContent">
+            <el-input type="textarea" :rows="2" placeholder="请输入跟进内容" v-model.trim="trackContent">
            </el-input>
            <el-row style="text-align: right;margin-top: 20px;">
                <el-button type="warning" @click="cancelClick">取消</el-button>

--- a/jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.js
+++ b/jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.js
@@ -11,11 +11,12 @@
        trackContent:"",
        trackRecords:[
-        ]
+        ],
+        currentRow:null,
      }
    },
  mounted: function() {
+    this.currentRow=null;
  },
@@ -56,7 +57,14 @@
    },
    onColFormater(row, column, cellvalue, index){
      /*这里解析跟进字段，解析为数组，取最后一条*/
-      console.log(column);
+      if(column.property=="tracklast"){
+        if(row.tracklog && row.tracklog!=""){
+          tlogobj= JSON.parse(row.tracklog.split("|")[0]);
+          console.log(tlogobj["content"],"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv");
+          return tlogobj["content"];
+        }
+     }
      return cellvalue;
    },
    handleSelectionChange: function(val) {
@@ -77,12 +85,29 @@
        this.$router.push({ path: "/mynotarizationflow", query: { ali_bizid: row.ali_bizid } });
      }
      if(key=="tracks"){
+        this.trackContent="";
+        this.currentRow=row;
        this.trackVisable=true;
+        this.handlerTrackLog(this.currentRow);
        if(this.trackRecords.length==0){
          this.trackRecords.push({"trackDate":"暂无跟进","trackContent":"请联系客户，进行跟进"});
        }
      }
    },
+    handlerTrackLog(row){
+      this.trackRecords=[];
+      if(row.tracklog && row.tracklog!=""){
+        let arrstrs=row.tracklog.split("|");
+        arrstrs.forEach((item)=>{
+          if(item && item!=""){
+            let it=JSON.parse(item);
+            let trackItem={"trackDate":`${it.dateStr} ${it.yw}`,"trackContent":`${it.timeStr} ${it.content}`};
+            this.trackRecords.push(trackItem);
+          }
+        })
+      }
+    },
    upsuccess(result){
      console.log(result);
    },
@@ -93,11 +118,18 @@
      this.trackVisable=false;
    },
    saveClick(){
-      let pushData={"pushData":{"trackDate":new Date().toLocaleString(),"trackContent":this.trackContent}};
+      if(this.trackContent==""){
+        return;
+      }
+      let tid=this.currentRow.id;
+      let pushData={"tid":tid,"log":{"content":this.trackContent}};
      var self=this;
-      this.$root.postReq("/web/transfer/tradetransferCtl/track", pushData).then(function (d) {
+      this.$root.postReq("/web/transfer/tradetransferCtl/track", {logdata:pushData}).then(function (d) {
        /*返回整个跟进字段，解析为数组*/
-         self.trackRecords.push(d.data);
+         console.log(d.data,"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+         self.currentRow.version=d.data.version;
+         self.currentRow.tracklog=d.data.tracklog;
+         self.handlerTrackLog(self.currentRow);
      })

--- a/jiaxiya/test.js
+++ b/jiaxiya/test.js
+console.log(new Date().toLocaleDateString())
+console.log(new Date().toLocaleTimeString())
+10023--月更新/周更新 10023全备份
+tm_history
+tm_week
+tm_month
+tm_week_all  备份
+tm_month_all 备份
+10022
+89天津