From 160f02bb7f7aafb0951e31e0ad6a0ae3416f1a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 9 Oct 2024 14:55:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84bug=202.=E9=A2=84=E9=85=8D=E7=9B=98?=
 =?UTF-8?q?=E5=9E=9B=E4=BD=8D=E5=A2=9E=E5=8A=A0=E5=B1=82=E6=95=B0=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF,=E5=A2=9E=E5=8A=A0=E9=A2=84=E9=85=8D=E7=9B=98?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=A6=96=E6=AC=A1=E6=91=86=E6=94=BE=E6=97=B6?=
 =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E8=88=B9=E5=8F=B7=E3=80=81=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E3=80=81=E5=88=86=E6=AE=B5,=E4=BA=8C=E6=AC=A1=E6=91=86?=
 =?UTF-8?q?=E6=94=BE=E6=97=B6=E6=97=B6=E6=8F=90=E9=86=92=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/aigc.svg                        |  1 +
 src/views/jhzxgl/dwGL.vue              | 18 +++++++++--
 src/views/jhzxgl/yppGL.vue             | 41 ++++++++++++++++++--------
 src/views/zyjhzx/components/Drawer.vue | 10 +++----
 4 files changed, 49 insertions(+), 21 deletions(-)
 create mode 100644 public/aigc.svg

diff --git a/public/aigc.svg b/public/aigc.svg
new file mode 100644
index 0000000..15b280f
--- /dev/null
+++ b/public/aigc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="64" height="64" viewBox="0 0 64 64"><defs><clipPath id="master_svg0_29_206"><rect x="0" y="0" width="64" height="64" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_29_206)"><g><path d="M17.372799999999998,27.6973L17.372799999999998,14.35715L31.6719,6L45.971,14.35715L45.971,27.3137L59,34.9286L59,51.6429L44.7009,60L32,52.5769L19.2991,60L5,51.6429L5,34.9286L17.372799999999998,27.6973ZM18.9285,31.9118L9.44389,37.4604L9.44389,49.041L19.3416,54.8312L29.2394,49.041L29.2394,37.943799999999996L18.9285,31.9118ZM21.7656,28.0427L31.9914,34.0202L41.5611,28.4263L41.5611,16.9544L31.6633,11.16877L21.7656,16.9544L21.7656,28.0427ZM44.8107,31.7758L34.8279,37.6017L34.8279,49.055L44.7257,54.8312L54.6234,49.055L54.6234,37.5025L44.8107,31.7758Z" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
diff --git a/src/views/jhzxgl/dwGL.vue b/src/views/jhzxgl/dwGL.vue
index 909e531..9bf8564 100644
--- a/src/views/jhzxgl/dwGL.vue
+++ b/src/views/jhzxgl/dwGL.vue
@@ -67,9 +67,6 @@
 </template>
 
 <script>
-import {getGhs} from "@/api/sjzx/sbxxWH";
-import {getCzplBase} from "@/api/sjzx/jcsj";
-import {cgjhdhqk} from "@/api/jhzx/sygd";
 import YppTq from "@/views/jhzxgl/components/YppTq.vue";
 import {getBfwz, saveBfwz} from "@/api/jhzxgl/ypp";
 
@@ -100,6 +97,21 @@ export default {
           filterRender: { name: 'FilterCombination', },
           editRender:{ name: '$input', props: { placeholder: '请输入垛位号' }}
         },
+        { field: 'dcCh', title: '船号', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          editRender:{ name: '$input', props: { placeholder: '请输入船号' }}
+        },
+        { field: 'dcPl', title: '批量', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          editRender:{ name: '$input', props: { placeholder: '请输入批量' }}
+        },
+        { field: 'dcFd', title: '分段', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          editRender:{ name: '$input', props: { placeholder: '请输入分段' }}
+        },
       ],
     }
   },
diff --git a/src/views/jhzxgl/yppGL.vue b/src/views/jhzxgl/yppGL.vue
index 229f8eb..3441bf3 100644
--- a/src/views/jhzxgl/yppGL.vue
+++ b/src/views/jhzxgl/yppGL.vue
@@ -211,6 +211,7 @@
 </template>
 
 <script>
+import { VXETable } from 'vxe-table'
 import {
   saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
 } from '@/api/jhzxgl/pgd'
@@ -220,7 +221,7 @@ import {null2str} from "@/utils/rpkj";
 import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
-import {saveDmppxxb,getDmppxxbList} from "@/api/jhzxgl/ypp";
+import {saveDmppxxb, getDmppxxbList, saveBfwz} from "@/api/jhzxgl/ypp";
 export default {
   name:'Cgjhdh',
   data() {
@@ -702,25 +703,32 @@ export default {
     bzClick(){
 
       this.dictData.dwxxs= this.dwxxs.filter(fst=>fst.qy===this.queryParam.qy)
-      console.log(this.dictData.zyqs)
     },
     bzClick1(){
       this.dictData.dwxxs1= this.dwxxs.filter(fst=>fst.qy===this.inParam.qy)
-      console.log(this.dictData.zyqs)
     },
-    updates2(){
+    async updates2() {
       let selectRecords = this.$refs.xGrid.getCheckboxRecords()
 
-      if(selectRecords.length>0){
-        for(let i = 0; i < selectRecords.length; i++) {
-
+      const dw = this.dictData.dwxxs.filter(item => item.dwh === this.inParam.dw && item.qy === this.inParam.qy)
+      if (selectRecords.length > 0 && dw.length > 0) {
+        const selectDw = dw[0]
+
+        for (let i = 0; i < selectRecords.length; i++) {
+          const item = selectRecords[i]
+          if (selectDw.dcCh && selectDw.dcPl && selectDw.dcFd) {
+            if (item.czbh !== selectDw.dcCh || item.pl !== selectDw.dcPl || item.fd !== selectDw.dcFd) {
+              const res = await VXETable.modal.confirm(`您确定要摆放到已经存放了${selectDw.dcCh},${selectDw.dcPl},${selectDw.dcFd}的垛位吗？`)
+              if (res !== 'confirm') {
+                break
+              }
+            }
+          }
 
           selectRecords[i].qq = this.inParam.qy
           selectRecords[i].dw = this.inParam.dw
-
-
-
         }
+
         this.$refs.xGrid.updateData(this.list)
       }
     },
@@ -757,7 +765,6 @@ export default {
 
     initBase(){
       getPgdBase({}).then(res=>{
-        console.log(res.data)
         this.zyqs=res.data.zyqs
         this.dwxxs=res.data.dwxxs
         this.zyrys=res.data.zyrys
@@ -808,6 +815,17 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
+          let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+          const dw = this.dictData.dwxxs.filter(item => item.dwh === this.inParam.dw && item.qy === this.inParam.qy)
+          if (dw.length > 0) {
+            const selectDw = dw[0]
+            if (!selectDw.dcCh && !selectDw.dcPl && !selectDw.dcFd) {
+              selectDw.dcCh = selectRecords[0].czbh
+              selectDw.dcPl = selectRecords[0].pl
+              selectDw.dcFd = selectRecords[0].fd
+              saveBfwz({edit:[selectDw]}).then(res=>{})
+            }
+          }
           saveDmppxxb(obj).then(res=>{
             if(res.success){
               this.initList()
@@ -869,7 +887,6 @@ export default {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
-          console.log(this.list)
         }
 
       })
diff --git a/src/views/zyjhzx/components/Drawer.vue b/src/views/zyjhzx/components/Drawer.vue
index d0d2be5..7f6c120 100644
--- a/src/views/zyjhzx/components/Drawer.vue
+++ b/src/views/zyjhzx/components/Drawer.vue
@@ -1,9 +1,9 @@
 <template>
-  <el-drawer class="transparent-drawer" size="8%" :visible.sync="drawer" :direction="direction" :modal="false" :withHeader="withHeader">
+  <el-drawer class="transparent-drawer" size="6%" :visible.sync="drawer" :direction="direction" :modal="false" :withHeader="withHeader">
     <div class="drawer">
       <template v-for="(item,index) in menu">
         <div class="menu-item" @click="handleSelect(item)">
-          <img src="https://aigc365.cc/static/pageGroup/all.svg" alt="AIGC" title="AIGC" style="width: 48px; height: 48px; filter: brightness(0.9);">
+          <img src="aigc.svg" alt="AIGC" title="AIGC" style="width: 48px; height: 48px; filter: brightness(0.9);">
           <br/>{{item}}
         </div>
       </template>
@@ -32,7 +32,7 @@ export default {
           this.$router.push(`/pwpg?zyq=${this.$route.query.zyq}&zyType=${this.$route.query.zyType}&deviceId=${this.$route.query.deviceId}`)
           break;
         case '理料':
-          this.$router.push(`/llpg?zyq=${this.$route.query.zyq}&zyType=${this.$route.query.zyType}&deviceId=${this.$route.query.deviceId}`)
+          this.$router.push(`/llfk?zyq=${this.$route.query.zyq}&zyType=${this.$route.query.zyType}&deviceId=${this.$route.query.deviceId}`)
           break;
         case '划线':
           this.$router.push(`/hxpg?zyq=${this.$route.query.zyq}&zyType=${this.$route.query.zyType}&deviceId=${this.$route.query.deviceId}`)
@@ -44,14 +44,12 @@ export default {
     }
   }
 }
-//background: #002166;
-
 </script>
 
 <style scoped>
 .drawer{
   height: 100vh;
-  background: #003586;
+  background: blue;
 
   .menu-item{
     width: 100%;