From 6edba733e3b56945ed5303e297b4f09ee90d49c6 Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Fri, 15 Dec 2023 16:02:29 +0800
Subject: [PATCH] a

---
 .../Mes/MesStock/MesStock/OutIn/LogDetail.vue     | 10 +++++++++-
 .../Middle/Mes/MesStock/MesStock/OutIn/data2.json |  6 +++---
 .../Mold/MoldProductionOrder/ComponentDetail.vue  | 15 ++++++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue
index 53cc6b7..dfbd4d5 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogDetail.vue
@@ -454,6 +454,8 @@ export default {
         addModeItems: [],
 
 
+        hiprintTemplate: null,
+
       };
 
       pageData.actions.get = pageData.actions.ProductStockLogDetail;
@@ -623,7 +625,13 @@ export default {
       ]
       this.formOptions.data.companyTitle = this.company.company_info.name + "送货单"
       console.log("this.formOptions.data", this.formOptions.data)
-      this.$refs.preView.show(hiprintTemplate, this.formOptions.data, width)
+      // this.$refs.preView.show(hiprintTemplate, this.formOptions.data, width)
+      hiprintTemplate.width = width
+      hiprintTemplate.print(this.formOptions.data, {}, {
+        callback: () => {
+          this.waitShowPrinter = false
+        }
+      })
     },
 
     formatNumber(cellValue) {
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/data2.json b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/data2.json
index 7fbfadb..c1e71ae 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/data2.json
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/data2.json
@@ -5,7 +5,7 @@
       "name": 1,
       "height": 120,
       "width": 210,
-      "paperHeader": 82.5,
+      "paperHeader": 20,
       "paperFooter": 802.5,
       "printElements": [
         {
@@ -263,7 +263,7 @@
             "left": 25,
             "top": 150,
             "height": 9.75,
-            "width": 235.5,
+            "width": 280.5,
             "title": "地址:潮州市浮洋镇潮汕公路乌洋路段 0768-5223999",
             "right": 261.177920254794,
             "bottom": 159.9694664695046,
@@ -284,7 +284,7 @@
             "top": 167.5,
             "height": 22.5,
             "width": 544.5,
-            "title": "凡属本公司送出的塑料壳体，请收到即检查验收质量呱后才能使用，如有问题，请于3天内与本公司联系，协高处理，否则恕不负责!一经装配，恕不退货",
+            "title": "凡属本公司送出的塑料壳体，请收到即检查验收质量后才能使用，如有问题，请于3天内与本公司联系，协高处理，否则恕不负责!一经装配，恕不退货",
             "right": 567,
             "bottom": 190.44673919677734,
             "vCenter": 294.75,
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
index 32144bf..17c04a3 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
@@ -6,7 +6,7 @@
                @popupSelected="onPopupSelected" :export-config="{}" @edit-closed="afterEditEvent"
                @edit-actived="beforeEditEvent"
                :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }">
-      <vxe-column title="图片" width="80" align="center">
+      <vxe-column title="图片" width="120" align="center">
         <template #default="{ row }">
           <div v-if="row.component_img" style="position: relative;" class="imgbox">
             <img style="width:50px;height:50px;" :src="row.component_img"
@@ -89,9 +89,7 @@
       <vxe-column field="inlay" title="镶件材料" align="center" width="140"
                   :edit-render="{ name: '$input', props: {} }"></vxe-column>
 
-      <vxe-column field="purchase_cost" title="采购成本" align="center" width="auto"
-                  :edit-render="{ name: '$input', props: {type: 'number' } }"></vxe-column>
-      <vxe-column field="processing_cost" title="加工成本" align="center" width="auto"
+      <vxe-column field="processing_cost" title="成本价" align="center" width="auto"
                   :edit-render="{ name: '$input', props: {type: 'number' } }"></vxe-column>
       <vxe-column field="remark" title="备注" align="center" width="auto"
                   :edit-render="{ name: '$input', props: {} }"></vxe-column>
@@ -157,8 +155,13 @@
               <a-button v-if="!row.is_complete" @click.stop="pageDone(row)" type="primary">完成</a-button>
             </a-tooltip>
             <div v-if="row.is_complete">
-              <a-tooltip placement="topLeft" :title="'完成时间：'+$mk.getDateString(row.complete_time)"
+              <a-tooltip placement="topLeft"
                          arrow-point-at-center>
+                <template #title>
+                  {{ row.send_time ? '发料时间：' + $mk.getDateString(row.send_time) : '' }}
+                  <br/>
+                  {{ row.complete_time ? '完成时间：' + $mk.getDateString(row.complete_time) : '' }}
+                </template>
                 <a-button v-if="!isComponentDone()" @click.stop="pageDone(row, true)">撤销</a-button>
               </a-tooltip>
             </div>
@@ -173,8 +176,6 @@
       <vxe-column field="complete_type" v-if="getDataId() && readonly" title="完工人员" width="80" align="center"
                   :params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
 
-      <vxe-column field="purchase_cost" title="采购成本(元)" width="130"
-                  :edit-render="{ name: '$input', props: {type: 'number' } }"></vxe-column>
       <vxe-column field="processing_cost" title="加工成本(元)" width="130"
                   :edit-render="{ name: '$input', props: {type: 'number' } }"></vxe-column>
       <vxe-column field="remark" title="备注" width="auto" :edit-render="{ name: '$input', props: {} }"></vxe-column>