From 86b274004aa8bdb4ac4bab668e4f3c1c7fad723a Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 26 Jun 2023 10:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/print.html             | 151 ----------------------------------
 src/views/dashboard/index.vue |   7 ++
 src/views/order/index.vue     |   7 ++
 3 files changed, 14 insertions(+), 151 deletions(-)
 delete mode 100644 public/print.html
diff --git a/public/print.html b/public/print.html
deleted file mode 100644
index 9b13eed..0000000
--- a/public/print.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>打印</title>
-    <script language="javascript" src="/admin/asset/jquery-1.11.2.min.js"></script>
-    <script>
-      function doPrint(obj) {
-        if ($(obj).hasClass("disabled")) {
-          alert("已经打印过了，如要重新打印请刷新本页");
-          return false;
-        }
-        $(obj).addClass("disabled");
-        var myDoc = {
-          settings: {
-            topMargin: 0,
-            leftMargin: 0,
-            bottomMargin: 0,
-            rightMargin: 0
-          }, // 设置上下左距页边距为10毫米，注意，单位是 1/10毫米
-          documents: document,
-          marginIgnored: true,
-          copyrights: '杰创软件拥有版权  www.jatools.com'
-        };
-        document.getElementById("jatoolsPrinter").print(myDoc, false); // 直接打印，不弹出打印机设置对话框
-        var ids = "{:$_REQUEST['ids']}";
-        var url = "{:U('confirmPrinted')}";
-        $.post(url, {
-          ids: ids
-        }, function() {
-
-        });
-      }
-    </script>
-    <style>
-      body {
-        font-family: "微软雅黑";
-        font-size: 12px;
-        padding: 0;
-        margin: 0;
-        background: #fff;
-      }
-
-      ul,
-      li {
-        padding: 0;
-        margin: 0;
-        list-style: none;
-      }
-
-      .clear {
-        clear: both;
-      }
-
-      .bar {
-        position: fixed;
-        top: 0;
-        left: 0;
-        height: 60px;
-        background: #333;
-        color: #fff;
-        line-height: 20px;
-        width: 100%;
-      }
-
-      .bar A {
-        color: #fff;
-        text-decoration: underline;
-      }
-
-      .bar A:hover {
-        text-decoration: none;
-        color: #ccc;
-      }
-
-      .bar .wp {
-        width: 1000px;
-        margin: auto;
-        position: relative;
-      }
-
-      .bar .wp .left {
-        float: left;
-      }
-
-      .bar .wp .right {
-        float: right;
-        padding-top: 20px;
-      }
-
-      .lists {
-        padding-top: 80px;
-        padding-bottom: 20px;
-
-      }
-
-      .lists li {
-        float: left;
-        margin-left: 20px;
-        margin-bottom: 10px;
-      }
-    </style>
-    <script type="text/javascript">
-      //解析URL传递的参数
-      function request(paras) {
-        var url = location.href; //url
-        var paraString = url.substring(url.indexOf("?") + 1, url.length).split("&");
-        var paraObj = {} //参数组
-        for (i = 0; j = paraString[i]; i++) {
-          paraObj[j.substring(0, j.indexOf("=")).toLowerCase()] = j.substring(j.indexOf("=") + 1, j.length);
-        }
-        var returnValue = paraObj[paras.toLowerCase()];
-        if (typeof(returnValue) == "undefined") {
-          return "";
-        } else {
-          return returnValue;
-        }
-      }
-      $(function() {
-        console.log(unescape(request("json")))
-        var json = JSON.parse(unescape(request("json")) );
-
-        let li = `<li id="page1" style="width: 4cm; height: 3cm;"><img src="${json.barcode}"
-            style="display:inline-block;width:100%;height:100%;"></li>`;
-        $("#uldata").html(li)
-      })
-    </script>
-  </head>
-  <body>
-    <div class="lists">
-      <ul id='uldata'>
-
-
-      </ul>
-    </div>
-    <div class="bar">
-      <div class="wp">
-        <div class="left">生成打印单{:count($pics)}张，耗时{$duration}秒<br />
-          本打印功能只能在IE浏览器使用，非IE浏览器请采用兼容模式<br />
-          使用之前需要安装插件（<a href="/Public/common/plugin/jatoolsPrinter_free.zip" target="_blank">点击下载</a>），并正确设置打印机</div>
-        <div class="right">
-          <input type="button" value="打印" onClick='doPrint(this);'>
-        </div>
-      </div>
-    </div>
-    <OBJECT ID="jatoolsPrinter" CLASSID="CLSID:B43D3361-D075-4BE2-87FE-057188254255"
-      codebase="jatoolsPrinter.cab#version=8,6,0,0">
-    </OBJECT>
-  </body>
-</html>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index bccc6ca..d1dfd99 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -120,6 +120,13 @@
         total:0,
         data:[],
         table:[
+          {
+            label:'订单名称',
+            sortable:false,
+            prop:'order.order_name',
+            width:180,
+            align:'left'
+          },
           {
             label:'客户姓名',
             sortable:false,
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 7f7a366..45e40d9 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -147,6 +147,13 @@ export default {
         }
       ],
       table:[
+        {
+          label:'订单名称',
+          sortable:false,
+          prop:'order.order_name',
+          width:180,
+          align:'left'
+        },
         {
           label:'客户姓名',
           sortable:false,
