diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index d7f3c37..c589c46 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -2432,6 +2432,8 @@ export default {
       }
     },
     cellStyle2({row}) {
+      if (!row){return ;}
+
       if (this.gcrl.includes(row.jssj)) {
         return {
           color: 'red',
diff --git a/src/views/jhzx/xbjhWH.vue b/src/views/jhzx/xbjhWH.vue
index 08a520a..6d3a9f3 100644
--- a/src/views/jhzx/xbjhWH.vue
+++ b/src/views/jhzx/xbjhWH.vue
@@ -99,11 +99,11 @@
           @checkbox-change="selectChangeEvent"
         >
 <!--          <vxe-column type="checkbox" width="50"></vxe-column>-->
-          <vxe-column type="seq" width="80" :resizable="false" show-overflow>
+          <vxe-column type="seq" width="110" :resizable="false" show-overflow>
             <template #header>
-              <div class="first-col">
-                <div class="first-col-top">年份</div>
-                <div class="first-col-bottom">产品</div>
+              <div class="first-col" style="height: 30px">
+                <div class="first-col-top" >年份</div>
+                <div class="first-col-bottom" >产品</div>
               </div>
             </template>
             <template #default="{ row, rowIndex }">
@@ -219,9 +219,16 @@ export default {
         return value1 - value2;
       };
     },
+    compare2(property) {
+      return function (object1, object2) {
+        let value1 = object1[property];
+        let value2 = object2[property];
+        // 降
+        return value2 - value1;
+      };
+    },
     // 格式转换
     getTableList(data) {
-
       Object.keys(data).forEach((item, index) => {
         data[item].sort(this.compare("nf"));
         data[item].sort(this.compare("yf"));
@@ -229,10 +236,11 @@ export default {
           em.zl = em.zl ? em.zl : null;
         });
       });
-      this.tableData = data;
       this.leftColumn = []; //左侧列数据
       this.topColumn = []; //顶部列数据
       this.arrList = []; //data数据
+      this.indexes= [];
+      this.tableData = data;
       var objeckList = {};
       var sumArr = [];
       var yearArr = [];
@@ -273,7 +281,7 @@ export default {
               yearArr[yearIndex].months.push({
                 title: em.yf,
                 field: "cl" + em.nf + em.yf,
-                zl: em.zl,
+                // zl: em.zl,
               });
             }
           }
@@ -311,6 +319,7 @@ export default {
         }
       }
       this.arrList = Object.values(objeckList); //data数据
+      this.$refs.tableRef.reloadData(this.arrList)
     },
 
     // 上传excel
@@ -383,6 +392,7 @@ export default {
           this.getTableList(res.data);
         }
       });
+
     },
     // 表尾列求和
     total(list, field) {
@@ -390,9 +400,12 @@ export default {
       let count = 0;
       list.forEach((item) => {
         if (item !== "dcCh" && item !== "zt") {
-          count += Number(item[field]);
+          if (item[field]){
+            count += Number(item[field]);
+          }
         }
       });
+
       return count;
     },
     footerMethod({ columns, data }) {
@@ -513,12 +526,12 @@ export default {
 .first-col .first-col-top {
   position: absolute;
   right: 4px;
-  top: -10px;
+  //top: -10px;
 }
 .first-col .first-col-bottom {
   position: absolute;
   left: 4px;
-  bottom: -10px;
+  bottom: -3px;
 }
 .my-filter {
   margin: 10px;
diff --git a/src/views/jhzx/zrcWH.vue b/src/views/jhzx/zrcWH.vue
index e853cfa..569309c 100644
--- a/src/views/jhzx/zrcWH.vue
+++ b/src/views/jhzx/zrcWH.vue
@@ -5,6 +5,39 @@
       <el-form ref="requestForm" :model="request" label-width="75px">
         <div class="flex-form" style="width: 100%">
           <div class="flex-query">
+            <div>
+              <el-form-item label="船号:" style="width: 250px">
+                <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="300px"
+                        :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>
+            </div>
             <div>
               <el-form-item label="钢加开始:" style="width: 300px">
                 <el-date-picker
@@ -105,7 +138,9 @@
 import { getList, tj, save, upload } from "@/api/jhzx/zrcWH";
 import {getToken} from "@/utils/auth";
 import {endLoading, startLoading} from "@/utils";
+import { getCzxx } from "@/api/jhzx/qfxq";
 import {Message} from "element-ui";
+import {getCzplBase} from "@/api/sjzx/jcsj";
 export default {
   name: "zrcWH",
   data() {
@@ -113,6 +148,7 @@ export default {
       request: {
         date: "",
         Zt: "0",
+        dcCh:''
       },
       isupload:'02',
       heads: { token: getToken() },
@@ -818,12 +854,24 @@ export default {
       ],
       fileList: [],
       checkedList: [],
+      ShipNoList: [], //船号
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
     };
   },
   created() {
     window.addEventListener("resize", this.getHeight);
     this.getHeight();
     this.initList();
+    this.getCzxx();
   },
   methods: {
     // 获取列表接口
@@ -831,6 +879,7 @@ export default {
       let params = {
         Zt: this.request.Zt,
         gjks: "",
+        dcCh: this.request.dcCh,
       };
       if (this.request.date && this.request.date.length > 0) {
         params.gjks =
@@ -847,6 +896,33 @@ export default {
         }
       });
     },
+    // 获取船号接口
+    getCzxx() {
+      getCzxx().then((res) => {
+        if (res.success) {
+          this.ShipNoList = res.data;
+        }
+      });
+      getCzplBase({}).then(res=>{
+        this.projectData=res.data.cbbm
+        this.projectData1=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.project.indexOf(this.request.dcCh.toUpperCase()) > -1)
+      } else {
+        this.projectData = this.projectData1.slice(0)
+      }
+
+    },
     // 上传excel
     beforeAvatarUpload(file) {
 
@@ -865,7 +941,8 @@ export default {
       endLoading()
       if (res.success) {
         this.$message({ message: '导入成功', type: 'success' })
-        this.initList();
+        this.list = res.data;
+        this.checkedList = [];
 
       } else {
         Message({
diff --git a/src/views/sjzx/sbxxWH.vue b/src/views/sjzx/sbxxWH.vue
index d7e3527..53bd589 100644
--- a/src/views/sjzx/sbxxWH.vue
+++ b/src/views/sjzx/sbxxWH.vue
@@ -357,6 +357,24 @@ export default {
           ],
           filterRender: { name: "FilterCombination" },
         },
+        { field: 'tzbh', title: '套料图名称', width: 120,formatter:['dictFormat','QGKW'],
+          editRender: {
+            name: "$select",
+            options: [],
+            props: { clearable: true },
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'gx', title: '工序', width: 160,formatter:['dictFormat','PCGX'],
+          editRender: {
+            name: "$select",
+            options: [],
+            props: { clearable: true },
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
         {
           field: "xqrs",
           title: "默认人数",
@@ -1015,6 +1033,7 @@ export default {
     ]),
   },
   methods: {
+
     // 获取列表接口
     initList() {
       getList(this.request).then((res) => {
@@ -1029,13 +1048,22 @@ export default {
         }
       });
     },
+
     initgzList(){
       const gzDict=window.localStorage.getItem( 'RYGX');
+      const tzbhDict=window.localStorage.getItem( 'QGKW');
+      const gxDict=window.localStorage.getItem( 'PCGX');
       const gzList =JSON.parse(gzDict)
+      const tzbhList =JSON.parse(tzbhDict)
+      const gxList =JSON.parse(gxDict)
       this.$nextTick(() => {
         const tableRef = this.$refs.tableRef;
         const gz = tableRef.getColumnByField("gz");
+        const tzbh = tableRef.getColumnByField("tzbh");
+        const gx = tableRef.getColumnByField("gx");
         const gzList1 = [];
+        const list2 = [];
+        const list3 = [];
         for (let i = 0; i < gzList.length; i++) {
           const temp = {
             label: gzList[i].bmsm,
@@ -1043,7 +1071,26 @@ export default {
           };
           gzList1.push(temp);
         }
+        for (let i = 0; i < tzbhList.length; i++) {
+          if (tzbhList[i].bmsm.length<2){
+            continue;
+          }
+          const temp = {
+            label: tzbhList[i].bmsm,
+            value: tzbhList[i].bm,
+          };
+          list2.push(temp);
+        }
+        for (let i = 0; i < gxList.length; i++) {
+          const temp = {
+            label: gxList[i].bmsm,
+            value: gxList[i].bm,
+          };
+          list3.push(temp);
+        }
         gz.editRender.options = gzList1;
+        tzbh.editRender.options = list2;
+        gx.editRender.options = list3;
       });
     },
     //   获取供应商接口