1、订单备注

src/views/modules/order/order.vue

@@ -216,7 +216,7 @@
         <!-- 列标题 -->
         <div :class="['tit', showHeadScroll ? 'fixed-top' : '']">
           <el-row style="width: 100%">
-            <el-col :span="7">
+            <el-col :span="5">
               <span class="item product">{{ $t("group.prodInfo") }}</span>
             </el-col>
             <el-col :span="3" class="transaction-price">
@@ -239,6 +239,9 @@
             <el-col :span="2" class="column-title">
               <span class="item">{{ $t("order.afterSalesStatus") }}</span>
             </el-col>
+            <el-col :span="2" class="column-title">
+              <span class="item">客服备注</span>
+            </el-col>
             <el-col :span="2" class="column-title">
               <span class="item">{{ $t("order.operation") }}</span>
             </el-col>
@@ -264,7 +267,7 @@
           </div>
           <div class="prod-cont">
             <el-row style="width: 100%">
-              <el-col :span="10" style="height: 100%">
+              <el-col :span="8" style="height: 100%">
                 <div class="item prod-item">
                   <div class="items name" v-for="orderItem in order.orderItems" :key="orderItem.orderItemId">
                     <!-- 商品信息 -->
@@ -475,6 +478,19 @@
                   }}</span>
                 </div>
               </el-col>
+              <el-col :span="2" style="height: 100%">
+                <div class="item">
+                  <el-tooltip placement="top" v-if="order.remarks">
+                    <div slot="content" style="font-size: 16px">
+                      <span>{{ order.remarks }}</span>
+                    </div>
+                    <div>
+                      <div class="buyer-name" style="color:red;overflow: hidden; width: 100px; text-overflow:ellipsis">{{ order.remarks }}</div>
+                    </div>
+                  </el-tooltip>
+                  <span v-else>暂无备注</span>
+                </div>
+              </el-col>
               <el-col :span="2" style="height: 100%">
                 <div class="item">
                   <div class="operate">

src/views/modules/order/orderInfo.vue

@@ -396,10 +396,11 @@
               <!--                  <div class="res" v-else>{{dataForm.userMobile}}</div>-->
               <!--                </div>-->
               <div class="item">
-                <div class="text">{{ $t("order.buyerMessage") }}：</div>
-                <div class="res">{{ dataForm.remarks }}</div>
-                <div class="res" v-if="dataForm.remarks === null || dataForm.remarks === ''">
-                  {{ $t("order.notYet") }}
+                <div class="text">{{ $t("order.orderRemarks") }}：</div>
+                <div class="res" v-if="">{{ dataForm.remarks }}</div>
+                <div
+                  class="res">
+                  <el-button type="text" @click="buyerRemarkVisible=true">修改</el-button>
                 </div>
               </div>
             </div>
@@ -598,6 +599,24 @@
       ref="orderAddrUpdate"
       @refreshUserAddrOrder="getDataList"
     ></order-addr-update>
+    <el-dialog
+      :append-to-body="true"
+      title="修改买家备注"
+      :visible.sync="buyerRemarkVisible"
+      v-if="buyerRemarkVisible"
+      width="30%"
+      left
+      :close-on-click-modal="false"
+      :close-on-press-escape="false">
+      <el-form :model="dataForm" label-position="right">
+        <el-form-item label="备注" label-width="70px">
+          <el-input v-model="dataForm.remarks" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="modifyBuyerRemarks()">确认</el-button>
+      </div>
+    </el-dialog>
     <el-dialog
       :append-to-body="true"
       title="修改下单时间"
@@ -645,10 +664,10 @@ export default {
       pdfInfo: {},
       orderStatus: 1,
       dataForm: {
+        remarks: '',
         orderId: 0,
         orderNumber: '',
         virtualRemark: '',
-        remarks: '',
         shopRemarks: '',
         total: 0,
         deliveryExpresses: [],
@@ -677,6 +696,7 @@ export default {
       showOrderCard: false,
       devyVisible: false,
       modifyCreateTimeVisible:false,
+      buyerRemarkVisible: false,
 
       // 商品列表
       prodList: []
@@ -717,6 +737,29 @@ export default {
     // this.init()
   },
   methods: {
+    modifyBuyerRemarks(){
+      this.$http({
+        url: this.$http.adornUrl('/platform/order/modifyRemarks'),
+        method: 'post',
+        data: this.$http.adornData({
+          orderNumber: this.dataForm.orderNumber,
+          remarks: this.dataForm.remarks
+        }),
+      }).then(({ data }) => {
+        this.buyerRemarkVisible = false
+        if(data){
+          this.$message({
+            message: "修改成功",
+            type: 'success'
+          })
+        }else{
+          this.$message({
+            message: "修改失败",
+            type: 'error'
+          })
+        }
+      })
+    },
     //修改下单时间
     modifyOrderCreateTime(){
       this.$http({