Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

# Conflicts:
#	package-lock.json

package-lock.json

@@ -6735,6 +6735,7 @@
     "jquery": {
       "version": "3.6.0",
 <<<<<<< HEAD
+<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
       "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
 =======
@@ -6742,6 +6743,15 @@
       "integrity": "sha1-xyoJ8Vwb3OFC9J2/EXC9+K2sJHA=",
       "dev": true
 >>>>>>> b1f44f50a8fae607da9483cb4578647393b834f2
+=======
+      "resolved": "https://registry.nlark.com/jquery/download/jquery-3.6.0.tgz",
+      "integrity": "sha1-xyoJ8Vwb3OFC9J2/EXC9+K2sJHA=",
+      "dev": true
+=======
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+>>>>>>> 1a3c4469c2d018edfc41d444b12db956002fea64
+>>>>>>> 856f0ce301665655f89af811590b7f21608db1c9
     },
     "js-base64": {
       "version": "2.6.4",

src/routerMap/index.js

@@ -294,7 +294,7 @@ const routerMap = [{
     },
     {
         path: '/cms/productionorderlist/deliverylist/checkUnusual',
-        name: 'DeliveryList', //生产订单列表-->出库表-->查看异常
+        name: 'checkUnusual', //生产订单列表-->出库表-->查看异常
         meta: {
             index: 4
         },
@@ -393,10 +393,9 @@ const routerMap = [{
     },
     {
         path: '/cms/ordermannage/businessorderlist/printlist',
-        name: 'BusinessOrderlist', //订单管理-->家装订单-->列表-->详情-->打印列表
+        name: 'BusinessPrintList', //订单管理-->家装订单-->列表-->详情-->打印列表
         meta: {
-            index: 4,
-            keepAlive: true
+            index: 4
         },
         component: (resolve) =>
             require(['@/views/OrderMannage/BusinessOrderlist/printlist'], resolve),

src/views/OrderMannage/BusinessOrderlist/printlist.vue

@@ -1,15 +1,16 @@
 <template>
     <div class="printcontent"> 
           <div class="table-box">
-        <button @click="PrintRow">打印</button>
+        <Button @click="PrintRow" type="primary" ghost>打印</Button>
+        <Button @click="back" type="primary" ghost style="right:110px">返回</Button>
         <div id="show-table" >
             <table cellspacing="0" cellpadding="0">
                 <thead>
                 <tr>
                     <td colspan="23" style="border: 0;">
                         <div class="table-header">
-                            <img class="left-img" :src="$store.state.ip + showTable.logo" alt="">
-                            <h1 class="table-title">{{showTable.title}}</h1><img class="right-img1" :src='$store.state.ip + showTable.right_logo1' alt=""><img class="right-img2" :src='$store.state.ip + showTable.right_logo2' alt="">
+                            <img class="left-img" :src="$store.state.ip + showTable.logo" alt="" v-show="showTable.logo?true:false">
+                            <h1 class="table-title">{{showTable.title}}</h1><img class="right-img1" :src='$store.state.ip + showTable.right_logo1' alt="" v-show="showTable.right_logo1?true:false"><img class="right-img2" :src='$store.state.ip + showTable.right_logo2' alt="" v-show="showTable.right_logo2?true:false">
                         </div>
                     </td>
                 </tr>
@@ -182,8 +183,8 @@
                 <tr>
                     <td colspan="23" style="border: 0;">
                         <div class="table-header">
-                            <img class="left-img" :src='showTable.logo' alt="">
-                            <h1 class="table-title">{{showTable.title}}</h1><img class="right-img1" :src='showTable.right_logo1' alt=""><img class="right-img2" :src='showTable.right_logo2' alt="">
+                            <img class="left-img" :src='showTable.logo' alt="" v-show="showTable.logo?true:false">
+                            <h1 class="table-title">{{showTable.title}}</h1><img class="right-img1" :src='showTable.right_logo1' alt="" v-show="showTable.right_logo1?true:false"><img class="right-img2" :src='showTable.right_logo2' alt="" v-show="showTable.right_logo2?true:false">
                         </div>
                     </td>
                 </tr>
@@ -382,6 +383,9 @@ export default {
         });
     },
     methods:{
+        back(){
+             this.$router.go(-1)
+        },
                 //打印
         PrintRow(index, row){
             this.$print(this.$refs.print) // 使用
@@ -487,7 +491,7 @@ export default {
     }
 
     .table-box {
-        padding: 0 20px;
+        padding: 0;
         width: 1000px;
         margin: 0 auto;
         margin-top: 40px;
@@ -503,6 +507,9 @@ export default {
         overflow: hidden;
         height: 0px;
     }
+    #show-table {
+        padding: 15px;
+    }
     .print-table{
         display: none;
     }