From 33a0db5dbdefeb45ba0ade1e85b66fc242bf8ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Mon, 18 Dec 2023 15:13:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A2=84=E9=85=8D=E7=9B=98=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jhzx/qfxq.js                   |   2 +-
 src/api/jhzxgl/ypp.js                  |  11 ++
 src/views/jhzxgl/components/YppTq.vue  | 223 ++++++++++-----------
 src/views/jhzxgl/components/Yppfk0.vue | 261 +++++++++++++++++++++++++
 src/views/jhzxgl/yppFK.vue             | 191 +++++++++++++++++-
 src/views/jhzxgl/yppGL.vue             |  43 +++-
 6 files changed, 607 insertions(+), 124 deletions(-)
 create mode 100644 src/views/jhzxgl/components/Yppfk0.vue

diff --git a/src/api/jhzx/qfxq.js b/src/api/jhzx/qfxq.js
index 7a302f7..a5dbe5a 100644
--- a/src/api/jhzx/qfxq.js
+++ b/src/api/jhzx/qfxq.js
@@ -8,4 +8,4 @@ export function save(data) {return request({url: '/dmQfxq/save', method: 'post',
 export function getCzxx(data) {return request({url: '/dmQfxq/getCzxx', method: 'post', data})}
 
 
-
+export function getQfxq(data) {return request({url: '/ypp/getQfxq', method: 'post', data})}
diff --git a/src/api/jhzxgl/ypp.js b/src/api/jhzxgl/ypp.js
index 51e7f51..528ed0a 100644
--- a/src/api/jhzxgl/ypp.js
+++ b/src/api/jhzxgl/ypp.js
@@ -14,3 +14,14 @@ export function getBfwz(data={}) {return request({url: '/dwxx/list', method: 'po
  * @returns {*}
  */
 export function saveBfwz(data={}) {return request({url: '/dwxx/addOrEdit', method: 'post', data})}
+
+
+export function getDmppxxbList(data={}) {return request({url: '/dmPpxxb/getDmppxxbList', method: 'post', data})}
+
+export function saveDmppxxb(data) {return request({url: '/dmPpxxb/saveDmppxxb', method: 'post', data})}
+
+export function getList(data) {return request({url: '/ypp/getList', method: 'post', data})}
+
+export function getLjxx(data) {return request({url: '/ypp/getLjxx', method: 'post', data})}
+
+export function checkBfwz(data) {return request({url: '/ypp/checkBfwz', method: 'post', data})}
diff --git a/src/views/jhzxgl/components/YppTq.vue b/src/views/jhzxgl/components/YppTq.vue
index da724fd..f6a8963 100644
--- a/src/views/jhzxgl/components/YppTq.vue
+++ b/src/views/jhzxgl/components/YppTq.vue
@@ -1,16 +1,46 @@
 <template>
-  <vxe-modal v-model="dialogVisible" title="钢料需求计划" width="1450" height="auto" remember>
+  <vxe-modal v-model="dialogVisible" title="前方需求计划" width="1450" height="auto" remember>
     <el-container>
       <el-header style="width: 100%; height: 35px;font-size: 12px">
-        <el-form :inline="true"  label-width="65px"  label-position="left">
+        <el-form :inline="true"  label-width="45px"  label-position="left">
           <el-row >
             <el-col :span="15" >
-              <el-form-item  >
-                <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">小组需求时间范围:</span>
-                <el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd"  type="month"  style="width: 33%;" />
-                <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
-                <el-input v-model="queryParam.endTime" ></el-input>
-                <!--              <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd"  type="month" style="width: 33%" />-->
+              <el-form-item label="船号:">
+                <vxe-pulldown ref="xDown4" transfer >
+                  <template #default>
+                    <vxe-input
+                      v-model="queryParam.dcCh"
+                      placeholder="船号"
+                      style="height: 28px;
+                    line-height: 28px; width: 150px;"
+                      suffix-icon="vxe-icon--search"
+                      @keyup="keyupEvent4"
+                      @focus="focusEvent4"
+                    />
+                  </template>
+                  <template #dropdown>
+                    <div class="my-dropdown  mytable " style="width: 250px">
+                      <vxe-grid
+                        highlight-hover-row
+                        height="auto"
+                        :data="projectData"
+                        :columns="projectColumns"
+                        @cell-click="cellClickEvent"
+                        show-overflow
+                      >
+                        <template #wgbsEdit="{ row}">
+                          <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                        </template>
+                      </vxe-grid>
+                    </div>
+                  </template>
+                </vxe-pulldown>
+              </el-form-item>
+              <el-form-item label="批量:">
+                <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
+              </el-form-item>
+              <el-form-item label="分段:">
+                <el-input v-model="queryParam.dcFd" type="search" placeholder="分段" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="9" >
@@ -23,65 +53,67 @@
       </el-header>
       <el-container  style="padding-top: 0px">
         <el-main>
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="钢料需求" name="first">
-              <div class="mytable">
-                <vxe-grid
-                  id="id"
-                  ref="xGrid"
-                  border
-                  resizable
-                  keep-source
-                  :align="'center'"
-                  :height="height"
-                  :auto-resize="true"
-                  :columns="tableColumn"
-                  :data="list"
-                  :custom-config="{ storage: true }"
-                  @checkbox-all="selectAllEvent"
-                  @checkbox-change="selectChangeEvent"
-                  :row-style="rowClassName"
-                  highlight-current-row
-                  highlight-hover-row
-                  show-overflow
-                >
-                </vxe-grid>
-              </div>
-            </el-tab-pane>
-          </el-tabs>
+          <div class="mytable">
+            <vxe-grid
+              id="id"
+              ref="xGrid"
+              border
+              resizable
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="true"
+              :columns="tableColumn"
+              :data="list"
+              :cell-dblclick="dblclick"
+              :custom-config="{ storage: true }"
+              highlight-current-row
+              highlight-hover-row
+              show-overflow
+            >
+            </vxe-grid>
+          </div>
         </el-main>
       </el-container>
     </el-container>
   </vxe-modal>
 </template>
 <script>
-import router from "@/router";
-import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getList} from '@/api/jhzx/sygdxq'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import { getToken } from '@/utils/auth'
 import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
 import {endLoading, startLoading} from "@/utils";
 import {Message} from "element-ui";
+
+import {getCzxx, getQfxq} from '@/api/jhzx/qfxq'
+import {getCzplBase} from "@/api/sjzx/jcsj";
+import {getLjxx} from "@/api/jhzxgl/ypp";
 export default {
   name:'YppTq',
   components: {ScrollPane},
   data() {
     return {
       dialogVisible:false,
-      activeName: 'first',
       queryParam: {
-        beginTime:'',
-        endTime:''
+        dcCh:'',
+        dcPl:'',
+        dcFd:'',
       },
+      projectData:[],
       monthList:[],
       list: [],
-      list1: [],
-      list2: [],
       checkedList: [],
       dictData:[],
       height: '500px',
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
       tableColumn:[
         { field: 'dcCh', title: '船只', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -188,31 +220,38 @@ export default {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
     this.initBase()
-  },
-  watch: {
-    'queryParam.beginTime'(newValue, Value){
-      if (newValue){
-        this.format(newValue);
-      }
-    }
+    this.initProject()
   },
   methods: {
+    dblclick(){
+      getLjxx().then(res=>{
+        this.$parent.add(res.data)
+        this.initList0();
+        this.list=[]
+        this.dialogVisible=false
+      })
+    },
     show(){
       this.dialogVisible=true
     },
-    rowClassName({ row,rowIndex }){
-      if (row.xqzt==='1') {
-        return  {
-          color: 'red',
-          cursor:'pointer'
-        }
-      }
-      if (row.xqzt==='2') {
-        return {
-          backgroundColor: 'darkseagreen',
-        }
+    initProject(){
+      getCzplBase({}).then(res=>{
+        this.projectData=res.data.cbbm
+      })
+    },
+    cellClickEvent({row}){
+      this.queryParam.dcCh = row.cbbm
+      this.$refs.xDown4.hidePanel()
+    },
+    focusEvent4(){
+      this.$refs.xDown4.showPanel()
+    },
+    keyupEvent4(){
+      if (this.queryParam.dcCh) {
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcCh.toUpperCase()) > -1)
+      } else {
+        this.projectData = this.projectData1.slice(0)
       }
-      return null
     },
     //转码
     formatterZt({cellValue}){
@@ -280,7 +319,7 @@ export default {
     //合并行
     rowspanMethod({ row, _rowIndex, column, visibleData }){
       //不要忘记在vxe-grid上配置  :scroll-y="{enabled: false}" 防止下拉时样式变化
-// 需要合并的列字段
+      // 需要合并的列字段
       let fields = ['nf','yf','rq','tzxqq'];// 需要合并的列
       const cellValue = row[column.property];// 合并行的相同的唯一标识
       if (cellValue && fields.includes(column.property)) {
@@ -300,20 +339,6 @@ export default {
           }
         }
       }
-    },
-    // 全选
-    selectAllEvent() {
-      const records = this.$refs.xGrid.getCheckboxRecords();
-      this.checkedList = records;
-    },
-    // 单选
-    selectChangeEvent() {
-      const records = this.$refs.xGrid.getCheckboxRecords();
-      this.checkedList = records;
-    },
-    //切换数据表点击事件
-    handleClick(tab, event) {
-
     },
     //转码信息
     initBase(){
@@ -321,47 +346,27 @@ export default {
         this.dictData = res.data
       })
     },
+    initList0() {
+      if (this.queryParam.dcCh) {
+        getQfxq(this.queryParam).then((res) => {
+          if (res.data){
+            this.list = res.data
+          }
+        })
+      }
+    },
     //初始化表1 数据
     initList() {
-      if (this.queryParam.beginTime === '') {
-        this.$message.warning('选择时间范围')
+      if (this.queryParam.dcCh === '') {
+        this.$message.warning('选择船号')
         return
       }
 
-      this.generatedCol()
-      getList(this.queryParam).then((res) => {
+      getQfxq(this.queryParam).then((res) => {
         if (res.data){
-          this.list = res.data.list
-          this.list2 = res.data.hz
-          if (this.$refs.xGrid) {
-            this.$refs.xGrid.loadData(this.list)
-          }
-          if (this.$refs.xGrid2) {
-            this.$refs.xGrid2.loadData(this.list2)
-          }
+          this.list = res.data
         }
       })
-      this.activeName='first'
-    },
-    generatedCol(){
-      //日期
-      this.tableColumn2= [] ;
-      this.tableColumn2.push({
-        key:  this.tableColumn2.length + 1,
-        field: 'dcCh',
-        title: '船只',
-        width: 200
-      })
-      var a =this.monthList
-      for (let i = 0; i < a.length; i++) {
-        this.tableColumn2.push({
-          key:  this.tableColumn2.length + 1,
-          field: 'yf'+a[i],
-          title: a[i]+`月`,
-          width: 200
-        })
-      }
-
     },
     formatDate ({ cellValue }) {
       return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
diff --git a/src/views/jhzxgl/components/Yppfk0.vue b/src/views/jhzxgl/components/Yppfk0.vue
new file mode 100644
index 0000000..7f3e757
--- /dev/null
+++ b/src/views/jhzxgl/components/Yppfk0.vue
@@ -0,0 +1,261 @@
+<template>
+  <el-container style="padding-top: 0px">
+    <el-main>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="前方需求计划" name="first">
+          <div class="mytable">
+            <vxe-grid
+              id="id"
+              border
+              ref="xqjhTableRef"
+              resizable
+              keep-source
+              :height="height"
+              :auto-resize="true"
+              :columns="xqjhColumn"
+              :data="xqjhList"
+              :scroll-y="{ enabled: true }"
+              :cell-dblclick="initLj"
+              highlight-hover-row
+            >
+            </vxe-grid>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="零件明细" name="second">
+          <div class="mytable">
+            <vxe-grid
+              id="id"
+              border
+              ref="ljTableRef"
+              resizable
+              keep-source
+              :height="height"
+              :auto-resize="true"
+              :columns="ljColumn"
+              :data="ljList"
+              :scroll-y="{ enabled: true }"
+              highlight-hover-row
+            >
+            </vxe-grid>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-main>
+  </el-container>
+</template>
+
+<script>
+import {getQfxq} from "@/api/jhzx/qfxq";
+import {getList} from "@/api/jhzxgl/ypp";
+
+export default {
+  name: "Yppfk0",
+  data() {
+    return {
+      height:'500px',
+      activeName:'first',
+      xqjhColumn:[
+        {type: "seq", width: "50", title: "序号", align: "center", fixed: "left",},
+        { field: 'dcCh', title: '船只', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcPl', title: '批量', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcFd', title: '分段号', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+      ],
+      ljColumn:[
+        {type: "seq", width: "50", title: "序号", align: "center", fixed: "left",},
+        { field: 'dcCh', title: '船只', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcPl', title: '批量', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcFd', title: '分段号', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcTh', title: '图号', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcZl', title: '组立', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcTz', title: '特征', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcYj', title: '依据', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcPb', title: '拼板', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcLph', title: '炉批号', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcTpbh', title: '托盘编号', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'jldw1', title: '单价重量计量单位', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'wpmc', title: '物品名称', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'wpgg', title: '规格', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'wpxh', title: '材质', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qy', title: '区域', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          editRender:{type:'$select',options:[],props:{clearable:true}}
+        },
+        { field: 'dwh', title: '垛位号', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          editRender:{type:'$select',options:[],props:{clearable:true}}
+        },
+        { field: 'wpjb', title: '物品级别', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'wpflm', title: '物品分类', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'abclx', title: 'ABC分类', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'gzlx', title: '加工进度', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ylzd1', title: '配套表类型', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'lcm1', title: '流程码', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zt', title: '状态', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'tpxx', title: '托盘信息', width: 120,align: "center",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+      ],
+      xqjhList:[],
+      ljList:[],
+    }
+  },
+  created() {
+    window.addEventListener("resize", this.getHeight);
+    this.getHeight();
+  },
+  methods: {
+    qtjc(){
+      const data=this.$refs.xqjhTableRef.getCheckboxRecords();
+      if (data.length<=0){
+        this.$message.warning("请先选择需要检查的数据")
+        return;
+      }
+
+    },
+    initXqjh(req){
+      getQfxq(req).then(res=>{
+        this.xqjhList=res.data
+      })
+    },
+    initLj({row}){
+      this.activeName='second'
+      getList(row).then(res=>{
+        this.ljList=res.data
+      })
+    },
+    handleClick(){
+
+    },
+    getHeight() {
+      this.height = window.innerHeight - 180;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+.el-header {
+  margin: 0;
+  padding: 5px 0;
+  height: auto;
+}
+.el-container {
+  padding: 0;
+  margin: 0;
+}
+.el-main {
+  padding: 0;
+}
+.el-col {
+  padding: 0;
+}
+.el-aside {
+  background: #fff;
+  padding: 0;
+}
+.el-container {
+  padding: 0;
+}
+.el-row {
+  margin-bottom: 5px;
+}
+.el-row:last-child {
+  margin-bottom: 0;
+}
+.tableStyles {
+  background: #0a76a4;
+}
+.my-dropdown {
+  width: 450px;
+  height: 250px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+}
+::v-deep .mytable .vxe-input {
+  display: flex !important;
+}
+::v-deep .el-form-item {
+  margin-bottom: 0px !important;
+}
+
+::v-deep .el-input{
+  width: auto !important;
+}
+</style>
diff --git a/src/views/jhzxgl/yppFK.vue b/src/views/jhzxgl/yppFK.vue
index ca2af9c..916e132 100644
--- a/src/views/jhzxgl/yppFK.vue
+++ b/src/views/jhzxgl/yppFK.vue
@@ -1,22 +1,205 @@
 <template>
   <el-container>
-    <span style="margin-top: 20px;margin-left: 20px">待开发...</span>
+    <el-header style="width: 100%;height: 35px">
+      <el-form ref="requestForm" :model="request" label-width="65px">
+        <el-row>
+          <el-col :span="3">
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="request.dcCh"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 150px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label="批量:">
+              <el-input v-model="request.dcPl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label="分段:">
+              <el-input v-model="request.dcFd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="在建船只:" label-width="105px">
+              <el-checkbox v-model="request.zjcz" type="search" placeholder="合同号" ></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" style="text-align: right">
+            <el-button type="primary" @click="initList()">查询</el-button>
+            <el-button type="success" @click="qtjc">齐套检查</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-header>
+    <Yppfk0 ref="yppfk0" />
   </el-container>
 </template>
 
 <script>
+import {getCzplBase} from "@/api/sjzx/jcsj";
+import YppTq from "@/views/jhzxgl/components/YppTq.vue";
+import {getBfwz} from "@/api/jhzxgl/ypp";
+import Yppfk0 from "@/views/jhzxgl/components/YppfkComponent.vue";
+
 export default {
-  name: "YppFK",
+  name: "Cgjhdh",
+  components: {Yppfk0, YppTq},
   data() {
+    return {
+      yppTqShow:false,
+      height: "500px",
+      list:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      qyList:[],
+      dwList:[],
+      bfwzList:[],
+      projectData:[],
+      request:{
+        dcCh:'',
+        dcPl:'',
+        dcFd:'',
+        zjcz:true
+      },
+    }
   },
   created() {
-
+    window.addEventListener("resize", this.getHeight);
+    this.getHeight();
+    this.initProject()
+    this.initBfwz()
   },
   methods: {
-
+    qtjc(){
+      this.$refs.yppfk0.qtjc()
+    },
+    initList(){
+      this.$refs.yppfk0.initXqjh(this.request)
+    },
+    initBfwz(){
+      getBfwz().then(res=>{
+        this.bfwzList=res.data
+        const _qyList=[]
+        const _dwhList=[]
+        const table=this.$refs.tableRef
+        const qyColumn=table.getColumnByField('qy')
+        const dwColumn=table.getColumnByField('dwh')
+        this.bfwzList.forEach(item=>{
+          _qyList.push({label:item.qy,value:item.qy})
+          _dwhList.push({label:item.dwh,value:item.dwh,_parent:item.qy})
+        })
+        qyColumn.editRender.options=_qyList
+        dwColumn.editRender.options=_dwhList
+        this.qyList=_qyList;
+        this.dwList=_dwhList
+      })
+    },
+    initProject(){
+      getCzplBase({}).then(res=>{
+        this.projectData=res.data.cbbm
+      })
+    },
+    cellClickEvent({row}){
+      this.request.dcCh = row.cbbm
+      this.$refs.xDown4.hidePanel()
+    },
+    focusEvent4(){
+      this.$refs.xDown4.showPanel()
+    },
+    keyupEvent4(){
+      if (this.request.dcCh) {
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
+      } else {
+        this.projectData = this.projectData1.slice(0)
+      }
+    },
+    getHeight() {
+      this.height = window.innerHeight - 160;
+    },
   }
 };
 </script>
 <style lang="scss" scoped >
+.el-header {
+  margin: 0;
+  padding: 5px 0;
+  height: auto;
+}
+.el-container {
+  padding: 0;
+  margin: 0;
+}
+.el-main {
+  padding: 0;
+}
+.el-col {
+  padding: 0;
+}
+.el-aside {
+  background: #fff;
+  padding: 0;
+}
+.el-container {
+  padding: 0;
+}
+.el-row {
+  margin-bottom: 5px;
+}
+.el-row:last-child {
+  margin-bottom: 0;
+}
+.tableStyles {
+  background: #0a76a4;
+}
+.my-dropdown {
+  width: 450px;
+  height: 250px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+}
+::v-deep .mytable .vxe-input {
+  display: flex !important;
+}
+::v-deep .el-form-item {
+  margin-bottom: 0px !important;
+}
 
+::v-deep .el-input{
+  width: auto !important;
+}
 </style>
diff --git a/src/views/jhzxgl/yppGL.vue b/src/views/jhzxgl/yppGL.vue
index 14b7f3e..f46babf 100644
--- a/src/views/jhzxgl/yppGL.vue
+++ b/src/views/jhzxgl/yppGL.vue
@@ -67,9 +67,10 @@
               <el-checkbox v-model="request.zjcz" type="search" placeholder="合同号" ></el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="14" style="text-align: right">
+          <el-col :span="11" style="text-align: right">
             <el-button type="primary" @click="initList()">查询</el-button>
-            <el-button type="primary" @click="save">保存</el-button>
+            <el-button type="primary" @click="tq">提取</el-button>
+            <el-button type="success" @click="save">保存</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -103,11 +104,9 @@
 </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} from "@/api/jhzxgl/ypp";
+import {checkBfwz, getBfwz, getDmppxxbList, saveDmppxxb} from "@/api/jhzxgl/ypp";
 
 export default {
   name: "Cgjhdh",
@@ -130,8 +129,9 @@ export default {
       bfwzList:[],
       projectData:[],
       request:{
-        wjwz:'',
+        dcCh:'',
         dwh:'',
+        qy:'',
         zjcz:true
       },
       tableColumn: [
@@ -195,12 +195,12 @@ export default {
         { field: 'qy', title: '区域', width: 120,align: "center",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
-          editRender:{type:'$select',options:[],props:{clearable:true}}
+          editRender:{type:'$select',options:[],props:{clearable:true},events:{change:this.bfwzChanged}}
         },
         { field: 'dwh', title: '垛位号', width: 120,align: "center",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
-          editRender:{type:'$select',options:[],props:{clearable:true}}
+          editRender:{type:'$select',options:[],props:{clearable:true},events:{change:this.bfwzChanged}}
         },
         { field: 'wpjb', title: '物品级别', width: 120,align: "center",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -245,10 +245,33 @@ export default {
   },
   methods: {
     save(){
-
+      const {insertRecords,updateRecords}=this.$refs.tableRef.getRecordset()
+      const list={...insertRecords,...updateRecords}
+      saveDmppxxb(list).then(res=>{
+        this.$message.success('保存成功')
+      })
+    },
+    bfwzChanged({row}){
+      checkBfwz([row]).then(res=>{
+        if (!res.data.success){
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    add(list){
+      this.list=list
     },
     initList(){
-
+      if (this.request.dcCh === '') {
+        this.$message.warning('选择船号')
+        return
+      }
+      getDmppxxbList(this.request).then(res=>{
+        this.list=res.data
+      })
+    },
+    tq(){
+      this.$refs.yppTqRef.show()
     },
     initBfwz(){
       getBfwz().then(res=>{