diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
index 862aff43..bf9606fe 100644
--- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
@@ -792,6 +792,11 @@ export default {
         prop: "fileName",
         width: 120,
       });
+      tempsTabs.push({
+        label: "产线",
+        prop: "productLine",
+        width: 120,
+      });
       return tempsTabs;
     },
     ...mapGetters(['userInfo'])//获取当前用户信息
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index d4d02ae9..ba86c163 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -165,7 +165,7 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="单据状态" prop="State">
+        <el-form-item label="单据状态" prop="State" v-show="isShowState">
           <el-checkbox-group  v-model="listQuery.state">
             <el-checkbox v-for="(item, index) in billState" :key="item.id" :label="item.id"  @change="checkedListChange(index)">
               {{ item.name }}
@@ -542,6 +542,7 @@ export default {
 	    productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
       isShowHostSN : false,
       isShowVin : false,
+      isShowState:true,
       
 
     };
@@ -824,7 +825,10 @@ export default {
         });
     },
 
-    valueselectChange(){this.$forceUpdate();},
+    valueselectChange(){
+      this.$forceUpdate();
+      
+    },
     handleImportSAP(){},
 
     handleFilter() {
@@ -1382,12 +1386,16 @@ export default {
         this.$refs.btn1.$el.innerText = "打印门板发货排序单";
         this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
         this.$refs.btn3.$el.innerText = "补打门板发货排序单";
+        this.listQuery.state.push(this.billState[0].id);
+        this.isShowState = true;
       }
       else if(this.listQuery.productType === 2)
       {
         this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
         this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
         this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
+        this.listQuery.state = [];
+        this.isShowState = false;
       }
       
     },
diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
index 9ee991a2..73a810d9 100644
--- a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
@@ -1,6 +1,7 @@
 <!--未知总成管理页-->
 <template>
   <div class="cr-body-content">
+    <div ref="box">
     <flexbox class="content-header">
       <el-form
         :model="listQuery"
@@ -167,6 +168,7 @@
         </el-form-item>
       </el-form>
     </flexbox>
+    </div>
     <div class="l-table">
       <!--表格渲染-->
       <el-table
@@ -254,6 +256,7 @@
           ></Detail>
         </div>
       </el-drawer>
+    </div>
       
       <!--添加总成-->
       <el-dialog
@@ -395,7 +398,6 @@
           <el-button type="text" @click="dialogNumVisible = false">取消</el-button>
         </div>
       </el-dialog>
-    </div>
   </div>
 </template>
 
@@ -562,11 +564,12 @@ export default {
       };
   },
   mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 220;
-    };
+    this.$nextTick(() => { 
+        var offsetHei = document.documentElement.clientHeight;
+        //console.log(offsetHei);
+        let boxH = this.$refs.box.offsetHeight;
+        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
+    });
   },
   created() {
     this.getvehicleModel();
@@ -741,7 +744,7 @@ export default {
     handleDownload() {
       this.listLoading = true;
       this.$axios
-        .gets("/api/newjit/unknown-assembly/export", this.listQuery)
+        .posts("/api/newjit/unknown-assembly/export", this.listQuery)
         .then((res) => {
           let filename = res;
           this.$axios
@@ -856,6 +859,7 @@ export default {
         .gets("/api/newjit/unknown-assembly/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
+          this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
@@ -1026,7 +1030,7 @@ export default {
           .gets(
             "/api/newjit/unknown-assembly/"+this.listUnknownAssemblyQuery.billId
           ).then((response) => {
-          this.data2 = response.item.unknownAssemblyParts;
+          this.data2 = response.item.unknownAssemblyParts.filter(u => u.partType === "1" || u.partType === null);
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;