1、客服备注

src/views/modules/order/order.vue

@@ -383,10 +383,10 @@
         <!-- 列标题 -->
         <div :class="['tit', showHeadScroll ? 'fixed-top' : '']">
           <el-row style="width: 100%">
-            <el-col :span="6" id="prod-info-title">
+            <el-col :span="5" id="prod-info-title">
               <span class="item product">{{ $t("temp.prodInfo") }}</span>
             </el-col>
-            <el-col :span="4" id="price-title" class="transaction-price">
+            <el-col :span="3" id="price-title" class="transaction-price">
               <span class="item">{{ $t("order.transaQuantity") }}</span>
             </el-col>
             <el-col :span="3" class="column-title">
@@ -404,6 +404,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("publics.operating") }}</span>
             </el-col>
@@ -433,7 +436,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"
@@ -681,6 +684,19 @@
                   <span v-else>{{$t("order.noAfterSales")}}</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

@@ -1076,6 +1076,7 @@ export default {
           remarks: this.dataForm.remarks
         }),
       }).then(({ data }) => {
+        this.buyerRemarkVisible = false
         if(data){
           this.$message({
             message: "修改成功",

src/views/modules/print/print-order-info.vue

@@ -26,7 +26,6 @@
       <el-form
         :model="dataForm"
         ref="dataForm"
-        @keyup.enter.native="dataFormSubmit()"
         label-width="auto"
       >
         <div class="mod-order-orderInfo">
@@ -40,6 +39,11 @@
                 <span class="text">{{ $t("order.createTime") }}:</span>
                 {{ dataForm.createTime }}
               </div>
+              <div class="item">
+                <div class="text">{{ $t("order.orderRemarks") }}：</div>
+                <div class="res">{{ dataForm.remark }}<el-button type="text" @click="buyerRemarkVisible=true">修改</el-button></div>
+              </div>
+            </div>
             </div>
             <div :class="['order-info',$t('language') === 'English'?'flex-wrap':'']">
               <div :class="['info-item',$t('language') === 'English'?'small-width':'']" v-if="dataForm.userAddrOrder && dataForm.userAddrOrder !== null">
@@ -174,6 +178,24 @@
           </div>
         </div>
       </el-form>
+     <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.remark" 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>
 </template>
 
@@ -188,6 +210,7 @@ export default {
   name: 'order-info',
   data () {
     return {
+      buyerRemarkVisible: false,
       visible: false,
       dataForm: {
         orderId: 0,
@@ -231,6 +254,29 @@ export default {
   created () {
   },
   methods: {
+    modifyBuyerRemarks(){
+      this.$http({
+        url: this.$http.adornUrl('/printOrder/printOrder/modifyRemarks'),
+        method: 'post',
+        data: this.$http.adornData({
+          orderNumber: this.dataForm.orderNumber,
+          remark: this.dataForm.remark
+        }),
+      }).then(({ data }) => {
+        this.buyerRemarkVisible = false
+        if(data){
+          this.$message({
+            message: "修改成功",
+            type: 'success'
+          })
+        }else{
+          this.$message({
+            message: "修改失败",
+            type: 'error'
+          })
+        }
+      })
+    },
     closeDialog(){
       this.visible = false;
       this.$emit('printOrderClose');

src/views/modules/print/print-order.vue

@@ -101,16 +101,19 @@
               size="small"
             ></el-input>
           </el-form-item>
-          <el-form-item label="是否优先"  :label-width=" lang === 'en' ? '145px' : '85px'">
+          <el-form-item label="客服备注"  :label-width=" lang === 'en' ? '145px' : '85px'">
             <template>
-              <el-select
-                v-model="dataForm.isPromotion"
-                clearable
-                size="small"
-              >
-                <el-option key="0" label="正常" value="0"></el-option>
-                <el-option key="1" label="优先" value="1"></el-option>
-              </el-select>
+              <div class="item">
+                <el-tooltip placement="top" v-if="dataForm.remark">
+                  <div slot="content" style="font-size: 16px">
+                    <span>{{ dataForm.remark }}</span>
+                  </div>
+                  <div>
+                    <div class="buyer-name" style="color:red;overflow: hidden; width: 100px; text-overflow:ellipsis">{{ dataForm.remark }}</div>
+                  </div>
+                </el-tooltip>
+                <span v-else>暂无备注</span>
+              </div>
             </template>
           </el-form-item>
           <el-form-item label="是否合单"  :label-width=" lang === 'en' ? '145px' : '85px'">
@@ -194,7 +197,7 @@
               <span class="item">订单状态</span>
             </el-col>
             <el-col :span="2" class="column-title">
-              <span class="item">是否优先</span>
+              <span class="item">客服备注</span>
             </el-col>
             <el-col :span="3" class="column-title">
               <span class="item">{{ $t("publics.operating") }}</span>
@@ -328,9 +331,15 @@
               </el-col>
               <el-col :span="2" style="height: 100%">
                 <div class="item">
-                  <span v-if="order.isPromotion === 0">正常</span>
-                  <span v-else-if="order.isPromotion === 1">优先</span>
-                  <span v-else>正常</span>
+                  <el-tooltip placement="top" v-if="order.remark">
+                    <div slot="content" style="font-size: 16px">
+                      <span>{{ order.remark }}</span>
+                    </div>
+                    <div>
+                      <div class="buyer-name" style="color:red;overflow: hidden; width: 100px; text-overflow:ellipsis">{{ order.remark }}</div>
+                    </div>
+                  </el-tooltip>
+                  <span v-else>暂无备注</span>
                 </div>
               </el-col>
               <el-col :span="3" style="height: 100%">