From 45d4d552545d110180c82baf454e641a48385d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Fri, 12 Apr 2024 14:21:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9C=88=E5=BA=A6=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E4=B8=8B=E5=8F=91=E5=89=8D=E6=A0=A1=E9=AA=8C=E5=A5=97?=
 =?UTF-8?q?=E6=96=99=E5=9B=BE=E4=B8=8B=E5=8F=91=E6=83=85=E5=86=B5=E3=80=81?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=83=85=E5=86=B5=E6=98=AF=E5=90=A6=E6=BB=A1?=
 =?UTF-8?q?=E8=B6=B3=E6=96=BD=E5=B7=A5=E8=BF=9B=E5=BA=A6=E8=A6=81=E6=B1=82?=
 =?UTF-8?q?,=E4=B8=8D=E6=BB=A1=E8=B6=B3=E6=97=B6=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=8F=90=E9=86=92,=E5=B9=B6=E4=B8=94=E5=9C=A8=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E6=97=B6=E8=BF=9B=E8=A1=8C=E4=BA=8C=E6=AC=A1=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=89=8D=E5=8F=AF=E4=B8=8B=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jhzx/qfxqCX.vue   |  1 +
 src/views/jhzx/ydjhzxXF.vue | 67 ++++++++++++++++++++++++++++++++++---
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/views/jhzx/qfxqCX.vue b/src/views/jhzx/qfxqCX.vue
index d3af256..f444efd 100644
--- a/src/views/jhzx/qfxqCX.vue
+++ b/src/views/jhzx/qfxqCX.vue
@@ -82,6 +82,7 @@
               highlight-hover-row
               show-overflow
               show-header-overflow
+              :scroll-y="{enabled: true}"
             >
             </vxe-grid>
           </div>
diff --git a/src/views/jhzx/ydjhzxXF.vue b/src/views/jhzx/ydjhzxXF.vue
index c333716..35badd5 100644
--- a/src/views/jhzx/ydjhzxXF.vue
+++ b/src/views/jhzx/ydjhzxXF.vue
@@ -47,6 +47,14 @@
               show-overflow
               :scroll-y="{enabled: true}"
             >
+              <template #ng="{ row }">
+                <div>
+                  <el-tooltip v-if="!!handlerTooTipContent(row)" class="item" effect="dark" :content="handlerTooTipContent(row)" placement="top-start">
+                    <i class="el-icon-warning icon-style"/>
+                  </el-tooltip>
+                  {{row.dcCh}}
+                </div>
+              </template>
             </vxe-grid>
           </div>
 <!--
@@ -205,7 +213,7 @@
 </template>
 
 <script>
-import router from "@/router";
+import { VXETable } from 'vxe-table'
 import {getCzxx, qfxqTJ} from '@/api/jhzx/qfxq'
 import {getYdjh, ydjhxf, getCnsb,hz} from '@/api/jhzx/sygd'
 import { mapGetters } from 'vuex'
@@ -244,7 +252,9 @@ export default {
         { type: 'seq', width: 60, title: '序号'},
         { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
+          filterRender: { name: 'FilterCombination', },
+          slots:{default:'ng'}
+        },
         { field: 'dcCh1', title: '目标船号',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空
@@ -949,11 +959,43 @@ export default {
     this.initBase()
   },
   methods: {
-    ydjhxf(){
-      if(this.checkedList.length<=0){
+    handlerTooTipContent(row){
+      let str=''
+      if(!row.czplpNew){
+        str+='缺少图纸计划;';
+      }else {
+        //套料图下发日期晚于切割日期
+        if(row.czplpNew.tltxfrq>row.qgrq){
+          str+='套料图下发日期('+row.czplpNew.tltxfrq+')不满足切割计划('+row.qgrq+');';
+        }
+      }
+      if(!row.kc){
+        str+='缺少库存;'
+      }
+      //下发提示信息
+      row._ngMsg=str;
+      return str;
+    },
+    async ydjhxf() {
+      if (this.checkedList.length <= 0) {
         return
       }
-      ydjhxf(this.checkedList).then(res=> {
+      let tipsFlag = false
+      let tipsMsg=''
+      for (const item of this.checkedList) {
+        if (item._ngMsg) {
+          tipsFlag = true
+          tipsMsg=item.dcCh+","+item.dcPl+","+item.dcFd+':'+item._ngMsg+'!是否继续下发'
+          break;
+        }
+      }
+      if (tipsFlag) {
+        const type = await VXETable.modal.confirm(tipsMsg)
+        if(type==='cancel'){
+          return;
+        }
+      }
+      ydjhxf(this.checkedList).then(res => {
         if (res.success) {
           this.initList()
         }
@@ -1069,6 +1111,21 @@ export default {
 </script>
 <style lang="scss" scoped >
 
+.icon-wrapper {
+  background-color: #f00; /* 红色背景 */
+  border-radius: 50%; /* 如果你想要圆形图标容器 */
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  width: 50px; /* 或者你想要的任何尺寸 */
+  height: 50px; /* 或者你想要的任何尺寸 */
+}
+
+.icon-style {
+  color: #fd2222; /* 图标颜色 */
+  /* 其他图标样式 */
+}
+
 .el-header{margin:0;padding: 5px;height:auto;
   .el-input{
     width: 140px;