From 317bf1cd47320d3ddc4ae93c5c2c3de2148d8fc6 Mon Sep 17 00:00:00 2001
From: mhhhh <mhhhh@mhhhhdeMacBook-Pro.local>
Date: Wed, 6 Jul 2022 15:18:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=89=93=E5=8D=B0=E5=8F=91=E8=B4=A7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/package.json                          |   1 +
 seller/src/main.js                           |   3 +
 seller/src/views/order/order/orderDetail.vue | 132 +++++++++++++++++++
 3 files changed, 136 insertions(+)

diff --git a/seller/package.json b/seller/package.json
index c61804ba..28269dbf 100644
--- a/seller/package.json
+++ b/seller/package.json
@@ -23,6 +23,7 @@
     "vue": "^2.6.10",
     "vue-json-excel": "^0.3.0",
     "vue-lazyload": "^1.3.3",
+    "vue-print-nb": "^1.7.5",
     "vue-qr": "^2.3.0",
     "vue-router": "^3.1.3",
     "vuedraggable": "^2.23.2",
diff --git a/seller/src/main.js b/seller/src/main.js
index 8d37f2d3..38786d8c 100644
--- a/seller/src/main.js
+++ b/seller/src/main.js
@@ -28,6 +28,9 @@ import * as filters from "@/utils/filters"; // global filter
 
 import { md5 } from "@/utils/md5.js";
 const { aMapSecurityJsCode } = require("@/config");
+// 打印
+import Print from 'vue-print-nb';
+Vue.use(Print);
 // 高德安全密钥
 if (aMapSecurityJsCode) {
   window._AMapSecurityConfig = {
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index bf7c05a4..721b0019 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -21,6 +21,7 @@
           >查看物流</Button
         >
         <Button @click="orderLogModal = true" type="primary">订单日志</Button>
+        <Button @click="printOrder" type="primary" ghost style="float:right;">打印发货单</Button>
         <Button v-if="allowOperation.take" @click="orderTake" type="primary"
           >订单核销</Button
         >
@@ -474,6 +475,61 @@
         <Button type="primary" @click="orderDeliverySubmit">发货</Button>
       </div>
     </Modal>
+    <!-- 打印发货单 -->
+    <Modal v-model="printModal" width="530" @on-cancel="printCancel" >
+      <p slot="header" style="line-height:26px;height:26px;">
+        <span style="float: left;">打印发货单</span>
+        <Button size="small" style="margin-right:35px;float: right;padding-bottom: 2px;" @click="printHiddenInfo"><template v-if="printHiddenFlag">显示</template><template v-else>隐藏</template>敏感信息</Button>
+      </p>
+      <div style="max-height:500px;overflow-y:auto;overflow-x:hidden;">
+        <div id="printInfo">
+          <Row v-if="orderInfo.order.remark !== ''">
+            <Col span="24">
+                <p class="lineH30 f14">备注：{{ orderInfo.order.remark }}</p>
+              </Col>
+          </Row>
+          <Row>
+              <Col span="12">
+                <p class="lineH30 f14">收件人：{{ orderInfo.order.consigneeName }}</p>
+              </Col>
+              <Col span="12" v-if="orderInfo.order.consigneeMobile">
+                <p class="lineH30 f14" v-if="printHiddenFlag">手机号：{{ orderInfo.order.consigneeMobile.replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")  }}</p>
+                <p class="lineH30 f14" v-else>手机号：{{ orderInfo.order.consigneeMobile  }}</p>
+              </Col>
+          </Row>
+          <Row>
+              <Col span="24">
+                <p class="lineH30 f14">收货地址：{{ orderInfo.order.consigneeAddressPath }}{{ orderInfo.order.consigneeDetail }}</p>
+              </Col>
+          </Row>
+          <Row>
+              <Col span="24">
+                <p class="printgoodtitle">商品信息</p>
+                <div class="printgoodinfo">
+                  <div v-for="(item,index) in orderInfo.orderItems" :key="index" class="printgooditem">
+                    <div class="printgoodname">
+                      <p>{{item.goodsName}}</p>
+                      <div class="printgoodguid">
+                        <span v-for="(itemchild, keychild) in JSON.parse(item.specs)" :key="keychild">
+                          <span class="printgoodguiditem" v-if="keychild != 'images'">
+                            {{ keychild }} : {{ itemchild }}
+                          </span>
+                        </span>
+                      </div>
+                    </div>
+                    <span class="printgoodnumber">数量：{{item.num}}</span>
+                  </div>
+                </div>
+              </Col>
+          </Row>
+        </div>
+      </div>
+      
+      <div slot="footer" style="text-align: right">
+        <Button @click="printModal = false">关闭</Button>
+        <Button type="primary" v-print="printInfoObj">打印发货单</Button>
+      </div>
+    </Modal>
   </div>
 </template>
 
@@ -491,6 +547,12 @@ export default {
   },
   data() {
     return {
+      printHiddenFlag:false,//隐藏信息
+      printInfoObj:{
+        id: "printInfo",//要打印的id名 无#号
+        popTitle:'&nbsp;',//页眉标题 默认浏览器标题 空字符串时显示undefined 使用html语言
+        extraHead:'',//头部文字 默认空
+      },
       submitLoading: false, // 添加或编辑提交状态
       region: [], //地区
       regionId: [], //地区id
@@ -512,6 +574,7 @@ export default {
         },
       },
       modal: false, //弹出调整价格框
+      printModal:false,//弹出打印发货单
       //调整价格表单
       modifyPriceForm: {
         orderPrice: 0,
@@ -684,6 +747,16 @@ export default {
       this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode;
       this.orderTakeModal = true;
     },
+    //打印发货单
+    printOrder(){
+      this.printModal = true;
+    },
+    printHiddenInfo(){
+      this.printHiddenFlag = !this.printHiddenFlag;
+    },
+    printCancel(){
+      // this.printHiddenFlag = false;
+    },
     //订单核销提交
     orderTakeSubmit() {
       this.$refs.orderTakeForm.validate((valid) => {
@@ -827,6 +900,9 @@ export default {
 <style lang="scss" scoped>
 // 建议引入通用样式 可删除下面样式代码
 // @import "@/styles/table-common.scss";
+.lineH30{
+  line-height: 30px;
+}
 .order-log-div {
   line-height: 30px;
   height: 500px;
@@ -953,4 +1029,60 @@ dl dt {
 .theme_color{
   color: $theme_color;
 }
+.f14{
+  font-size: 14px;
+  color: #333;
+}
+.printgoodtitle{
+  font-size: 14px;
+  line-height: 1.5;
+  margin-top: 15px;
+  color: #333;
+}
+.printgoodinfo{
+  // font-size: 14px;
+  // background: #f2f2f2;
+  // border-bottom:2px solid #333 ;
+  padding: 10px;
+  overflow: hidden;
+  color: #333;
+  .printgooditem{
+    border-bottom: 1px solid #e8eaec;
+    display: flex;
+    align-items: flex-start;
+    overflow: hidden;
+    line-height: 30px;
+    margin-bottom: 10px;
+    padding-bottom: 10px;
+    .printgoodname{
+      flex: 1;
+      overflow: hidden;
+      .printgoodguid{
+        font-size: 12px;
+        color:#999999;
+        line-height:1.5;
+        .printgoodguiditem{
+          margin-right: 10px;
+        }
+      }
+    }
+    .printgoodprice{
+      width: 135px;
+      margin-left: 15px;
+    }
+    .printgoodnumber{
+      width: 85px;
+      margin-left: 15px;
+    }
+  }
+}
+@media print {
+  @page{
+    size:  auto;
+    margin: 3mm;
+  }
+  html,body{
+    height:inherit;
+  }
+}
 </style>

From 994b700892419e3bf8519bde42bbcc065126d119 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 6 Jul 2022 16:18:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/orderCenter/MyOrder.vue                  | 2 +-
 manager/src/views/promotions/kanjia/kanjia-activity-goods.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue
index eb0966d0..f7da6acd 100644
--- a/buyer/src/pages/home/orderCenter/MyOrder.vue
+++ b/buyer/src/pages/home/orderCenter/MyOrder.vue
@@ -32,7 +32,7 @@
             </div>
           </div>
           <div>
-            <Button @click="delOrder(order.sn)" class="del-btn mr_10 fontsize_16" style="margin-top:-5px;" type="text" icon="ios-trash-outline" size="small"></Button>
+            <Button v-if="order.orderStatus === 'COMPLETED'" @click="delOrder(order.sn)" class="del-btn mr_10 fontsize_16" style="margin-top:-5px;" type="text" icon="ios-trash-outline" size="small"></Button>
             <span>{{ order.flowPrice | unitPrice("￥") }}</span>
           </div>
         </div>
diff --git a/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue b/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
index 7d01f0a6..0be9dd6a 100644
--- a/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
+++ b/manager/src/views/promotions/kanjia/kanjia-activity-goods.vue
@@ -112,7 +112,6 @@
             >查看
           </Button>
           <Button
-            v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'END'"
             type="error"
             size="small"
             style="margin-right: 10px"