From bee4b118ecb39ead26f54d5ee08ae57b8a9720a2 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 10 Nov 2022 14:22:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../printEquipmentAccountLabel.html           | 27 -------------------
 .../printEquipmentAccountLabel.js             |  6 ++---
 .../printEquipmentAccountLabels.js            |  4 +--
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/public/pages/property/printEquipmentAccountLabel/printEquipmentAccountLabel.html b/public/pages/property/printEquipmentAccountLabel/printEquipmentAccountLabel.html
index 04614c074..2851fb23f 100644
--- a/public/pages/property/printEquipmentAccountLabel/printEquipmentAccountLabel.html
+++ b/public/pages/property/printEquipmentAccountLabel/printEquipmentAccountLabel.html
@@ -1,33 +1,6 @@
 <div>
     <div>
         <div>
-            <!-- <div class="row">
-                <div class="col-sm-4">
-                    <span><span><vc:i18n name="报修单号" namespace="printEquipmentAccount"></vc:i18n></span>：{{printEquipmentAccountInfo.repairId}}</span>
-                </div>
-                <div class="col-sm-4">
-                    <span><span><vc:i18n name="报修类型" namespace="printEquipmentAccount"></vc:i18n></span>：{{printEquipmentAccountInfo.repairTypeName}}</span>
-                </div>
-                <div class="col-sm-4">
-                    <span><span><vc:i18n name="预约时间" namespace="printEquipmentAccount"></vc:i18n></span>：{{printEquipmentAccountInfo.appointmentTime}}</span>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-4">
-                    <span><span><vc:i18n name="报修人" namespace="printEquipmentAccount"></vc:i18n></span>：{{printEquipmentAccountInfo.repairName}}</span>
-                </div>
-                <div class="col-sm-4">
-                    <span><span><vc:i18n name="联系电话" namespace="printEquipmentAccount"></vc:i18n></span>：{{printEquipmentAccountInfo.tel}}</span>
-                </div>
-                <div class="col-sm-4">
-                    <span><span><vc:i18n name="位置" namespace="printEquipmentAccount"></vc:i18n></span>：{{printEquipmentAccountInfo.repairObjName}}</span>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-sm-12">
-                    <span><span><vc:i18n name="预约内容" namespace="printEquipmentAccount"></vc:i18n></span>：{{printEquipmentAccountInfo.context}}</span>
-                </div>
-            </div> -->
             <div class="row">
                 <div class="col-sm-4">
                     <span><span><vc:i18n name="设备ID" namespace="printEquipmentAccount"></vc:i18n></span>：{{printEquipmentAccountInfo.machineId}}</span>
diff --git a/public/pages/property/printEquipmentAccountLabel/printEquipmentAccountLabel.js b/public/pages/property/printEquipmentAccountLabel/printEquipmentAccountLabel.js
index ca80113d8..958be576c 100644
--- a/public/pages/property/printEquipmentAccountLabel/printEquipmentAccountLabel.js
+++ b/public/pages/property/printEquipmentAccountLabel/printEquipmentAccountLabel.js
@@ -29,6 +29,7 @@
                 chargeUseName: "",
                 remark: '',
                 yqName: '',
+                url:''
             },
             printFlag:'0',
             nowTime: ''
@@ -56,14 +57,14 @@
                     }
                 };
                 //发送get请求
-                vc.http.apiGet('equipmentAccount.listEquipmentAccount',
+                vc.http.apiGet('/equipmentAccount.listEquipmentAccount',
                 param,
                 function (json, res) {
                     var _repairDetailInfo = JSON.parse(json);
                     vc.copyObject(_repairDetailInfo.data[0], $that.printEquipmentAccountInfo);
                     document.getElementById("qrcode").innerHTML = "";
                     let qrcode = new QRCode(document.getElementById("qrcode"), {
-                        text: $that.printEquipmentAccountInfo.machineId,  //你想要填写的文本
+                        text: $that.printEquipmentAccountInfo.url,  //你想要填写的文本
                         width: 200, //生成的二维码的宽度
                         height: 200, //生成的二维码的高度
                         colorDark: "#000000", // 生成的二维码的深色部分
@@ -82,7 +83,6 @@
             _printPurchaseApplyDiv: function () {
                 
                 $that.printFlag = '1';
-                console.log('console.log($that.printFlag);',$that.printFlag);
                 document.getElementById("print-btn").style.display="none";//隐藏
 
                 window.print();
diff --git a/public/pages/property/printEquipmentAccountLabels/printEquipmentAccountLabels.js b/public/pages/property/printEquipmentAccountLabels/printEquipmentAccountLabels.js
index 26c64d221..704bc7ac4 100644
--- a/public/pages/property/printEquipmentAccountLabels/printEquipmentAccountLabels.js
+++ b/public/pages/property/printEquipmentAccountLabels/printEquipmentAccountLabels.js
@@ -32,7 +32,7 @@
                     }
                 };
                 //发送get请求
-                    vc.http.apiGet('equipmentAccount.listEquipmentAccount',
+                    vc.http.apiGet('/equipmentAccount.listEquipmentAccount',
                     param,
                     function (json, res) {
                         var _equipmentAccountManageInfo = JSON.parse(json);
@@ -49,7 +49,7 @@
             _generatorQrCode:function(){
                 $that.equipmentInfo.equipmentAccounts.forEach(item => {
                     let qrcode = new QRCode('a'+item.machineId, {
-                        text: item.machineId,  //你想要填写的文本
+                        text: item.url,  //你想要填写的文本
                         width: 200, //生成的二维码的宽度
                         height: 200, //生成的二维码的高度
                         colorDark: "#000000", // 生成的二维码的深色部分