From c072e15a2065541da349dcd841c2fbc3892d4ada Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Thu, 19 Oct 2023 11:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mk/components/editors/MkFormCropper.vue        |  2 +-
 .../Mold/MoldProductionOrder/ComponentDetail.vue   | 14 ++++++++++++--
 src/pages/Middle/Mold/MoldProductionOrder/Edit.vue |  2 +-
 src/pages/Middle/Mold/MoldProductionOrder/List.vue |  4 ++--
 src/pages/Middle/Mold/Touch/Reporting.vue          | 11 ++++++-----
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/application/mk/components/editors/MkFormCropper.vue b/src/application/mk/components/editors/MkFormCropper.vue
index bd2b608..9372661 100644
--- a/src/application/mk/components/editors/MkFormCropper.vue
+++ b/src/application/mk/components/editors/MkFormCropper.vue
@@ -6,7 +6,7 @@
       <div class="ant-upload ant-upload-select ant-upload-select-picture-card" @click="showCropper">
         <span role="button" tabindex="0" class="ant-upload">
 
-          <img class="img-preview" v-if="showUrl" :src="showUrl" alt="avatar" />
+          <img class="img-preview" v-if="showUrl" :src="showUrl" alt="avatar" @click.stop="$hevueImgPreview(showUrl)" />
           <div v-else-if="isReadonly !== true">
             <a-icon :type="loading ? 'loading' : 'plus'" />
             <div class="ant-upload-text">
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
index 97f8f7c..3a22192 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
@@ -51,6 +51,16 @@
       <vxe-column field="inlay" title="镶件材料" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
 
       <vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
+      <vxe-column title="模具图片" width="90">
+        <template #default="{ row }">
+          <img v-if="row.component_detail && row.component_detail.image" style="width:50px;height:50px;"
+            :src="row.component_detail.image"   @click.stop="$hevueImgPreview(row.component_detail.image)" />
+          <span v-else></span>
+
+        </template>
+      </vxe-column>
+
+
 
     </vxe-table>
 
@@ -551,9 +561,9 @@ export default {
     },
 
     postDataUpdate() {
-      let postdata = {}; 
+      let postdata = {};
 
-      this.detailsData2.forEach(item => { 
+      this.detailsData2.forEach(item => {
         item.component_line = this.detailsData[0].component_line;
       })
 
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
index 333467d..f2f575c 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
@@ -479,7 +479,7 @@ export default {
 
         if (!item.component_id) {
           return;
-        }
+        } 
         let key = infos.length + '' + (this.loadCount + '');
         let info = {
           key: key, data: {
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/List.vue b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
index 4e74edc..d5014f7 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/List.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
@@ -14,7 +14,7 @@
 
 
     <template v-slot:column4="{ row }">
-      <img v-if="row.mold_detail.image" style="width:50px;height:50px;" :src="row.mold_detail.image" />
+      <img v-if="row.mold_detail.image" style="width:50px;height:50px;" :src="row.mold_detail.image" @click.stop="$hevueImgPreview(row.mold_detail.image)" />
       <span v-else></span>
     </template>
     <template v-slot:column5="{ row }">
@@ -206,7 +206,7 @@ export default {
           sortConfig: {
             defaultSort: {
               field: 'complete_time',
-              order: 'desc'
+              order: 'asc'
             },
             trigger: 'cell', // 触发排序的方式
             remote: true // 是否远程排序
diff --git a/src/pages/Middle/Mold/Touch/Reporting.vue b/src/pages/Middle/Mold/Touch/Reporting.vue
index 59c20d9..f31c6b2 100644
--- a/src/pages/Middle/Mold/Touch/Reporting.vue
+++ b/src/pages/Middle/Mold/Touch/Reporting.vue
@@ -42,7 +42,7 @@
               </div>
               <div class="card-item-progress">
 
-                <img v-if="item.component_detail && item.component_detail.image"
+                <img v-if="item.component_detail && item.component_detail.image" @click.stop="$hevueImgPreview(item.component_detail.image)"
                   style="width:50px;height:50px;margin-right: 10px;" :src="item.component_detail.image" />
                 <span v-else></span>
 
@@ -92,7 +92,7 @@
 
             </a-tab-pane>
             <a-tab-pane key="2" tab="即将超时布产列表" force-render>
-              <vxe-table border show-overflow keep-source ref="xTable3" :height="400" :row-config="{height: 60}" :data="poData">
+              <vxe-table border show-overflow keep-source ref="xTable3" :height="610" :row-config="{height: 80}" :data="poData">
                 <vxe-column field="code" title="编码" width="130"></vxe-column>
                 <vxe-column field="mold_master_name" title="模具师傅" width="130"></vxe-column>
                 <vxe-column field="engineer_name" title="工程师傅" width="130"></vxe-column>
@@ -101,7 +101,7 @@
                   title="模具" width="130"></vxe-column>
                 <vxe-column title="模具图片" width="110">
                   <template #default="{ row }">
-                    <img v-if="row.mold_detail.image" style="width:50px;height:50px;" :src="row.mold_detail.image" />
+                    <img v-if="row.mold_detail.image" style="width:50px;height:50px;" :src="row.mold_detail.image" @click.stop="$hevueImgPreview(row.mold_detail.image)" />
                     <span v-else></span>
                   </template>
                 </vxe-column>
@@ -383,6 +383,8 @@ export default {
       }
     },
     loadPoData() {
+      
+
       this.$mk.post({
         url: `${BASE_URL.BASE_URL}/MoldProductionOrder/Get/TouchScreen/v1/mold/production/order/touchScreen/order/list`,
         loading: "搜索中...",
@@ -394,8 +396,7 @@ export default {
           "end_time": 0,
           "company_token": process.env.VUE_APP_COMPANYTOKEN,
           "store_id": 0,
-          "order_bys": [
-          ],
+          "order_bys": [{"column":"complete_time","order":"asc"}],  
           "limit": 0,
           "project_token": process.env.VUE_APP_APPTOKEN,
           "beid": parseInt(process.env.VUE_APP_BEID),