diff --git a/vue/src/router/modules/fis.js b/vue/src/router/modules/fis.js
index 0685eee..4e38cd3 100644
--- a/vue/src/router/modules/fis.js
+++ b/vue/src/router/modules/fis.js
@@ -36,16 +36,16 @@ const pgfis = {
                 icon: '发货'
             }
         },
-				{
-						path: '/pg-partSwitch',
-						component: () => import('@/views/pg-fis/basedate/partSwitch'),
-						name: 'pg-partSwitch',//命名路由
-						meta: {
-								title: '零件切换管理',
-								//roles: ['SettleAccount.Reports'],
-								icon: '发货'
-						}
-				},
+				// {
+				// 		path: '/pg-partSwitch',
+				// 		component: () => import('@/views/pg-fis/basedate/partSwitch'),
+				// 		name: 'pg-partSwitch',//命名路由
+				// 		meta: {
+				// 				title: '零件切换管理',
+				// 				//roles: ['SettleAccount.Reports'],
+				// 				icon: '发货'
+				// 		}
+				// },
         {
             path: '/pg-unknownAssembly',
             component: () => import('@/views/pg-fis/basedate/unknownAssembly'),
@@ -66,16 +66,16 @@ const pgfis = {
                 icon: '供货'
             }
         },
-        {
-            path: '/pg-M100BIll',
-            component: () => import('@/views/pg-fis/basedate/m100BIll'),
-            name: 'pg-M100BIll',//命名路由
-            meta: {
-                title: 'M100单据信息维护',
-                //roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        },
+        // {
+        //     path: '/pg-M100BIll',
+        //     component: () => import('@/views/pg-fis/basedate/m100BIll'),
+        //     name: 'pg-M100BIll',//命名路由
+        //     meta: {
+        //         title: 'M100单据信息维护',
+        //         //roles: ['SettleAccount.Reports'],
+        //         icon: '客户零件'
+        //     }
+        // },
         // {
         //     path: '/pg-M100Online',
         //     component: () => import('@/views/pg-fis/basedate/m100Online'),
@@ -106,26 +106,26 @@ const pgfis = {
         //         icon: '客户零件'
         //     }
         // },
-        {
-            path: '/pg-R100Online',
-            component: () => import('@/views/pg-fis/basedate/r100Online'),
-            name: 'pg-R100Online',//命名路由
-            meta: {
-                title: 'R100上线信息',
-                //roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        },
-        {
-            path: '/pg-weldingAssembly',
-            component: () => import('@/views/pg-fis/basedate/weldingAssembly'),
-            name: 'pg-weldingAssembly',//命名路由
-            meta: {
-                title: '焊装总装对比',
-                //roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        },
+        // {
+        //     path: '/pg-R100Online',
+        //     component: () => import('@/views/pg-fis/basedate/r100Online'),
+        //     name: 'pg-R100Online',//命名路由
+        //     meta: {
+        //         title: 'R100上线信息',
+        //         //roles: ['SettleAccount.Reports'],
+        //         icon: '客户零件'
+        //     }
+        // },
+        // {
+        //     path: '/pg-weldingAssembly',
+        //     component: () => import('@/views/pg-fis/basedate/weldingAssembly'),
+        //     name: 'pg-weldingAssembly',//命名路由
+        //     meta: {
+        //         title: '焊装总装对比',
+        //         //roles: ['SettleAccount.Reports'],
+        //         icon: '客户零件'
+        //     }
+        // },
         {
             path: '/pg-logRemind',
             component: () => import('@/views/pg-fis/basedate/logRemind'),
diff --git a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
index 76eaaa4..a34bc0c 100644
--- a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
+++ b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
@@ -66,7 +66,7 @@
           </el-form-item>
 
           <!-- <el-row> -->
-          <el-form-item label="大众顺序号:" prop="hostSN">
+          <el-form-item label="流水号:" prop="hostSN">
             <el-input
               v-model="listQuery.HostSNBegin"
               placeholder=""
@@ -87,7 +87,7 @@
             />
           </el-form-item>
 
-          <el-form-item label="KNR:" prop="KNRBegin">
+          <el-form-item label="车身号:" prop="KNRBegin">
             <el-input
               v-model="listQuery.KNRBegin"
               placeholder=""
@@ -318,7 +318,7 @@ export default {
       billState: [
         { id: 1, name: "未解析" },
         { id: 2, name: "已解析" },
-        { id: 4, name: "断号" },
+        // { id: 4, name: "断号" },
       ],
       //valueSelect: "",
       customerInfos: [],
@@ -428,7 +428,7 @@ export default {
       PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
       productTypeList: [
         { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
+        // { id: 2, name: "柱护板" },
       ],
       //isShowHostSN: false,
       //isShowVin: false,
@@ -436,6 +436,11 @@ export default {
     };
   },
   mounted() {
+// 查询条件20240117更改（只改文字，参数不变）
+// - 生产线 去掉 柱护板 选项
+// - 大众顺序号 改成 流水号
+// - KNR 改成 车身号
+// - 单据状态 隐藏 断号
     let _this = this
     window.addEventListener('resize',function(){
       _this.changeMainTableHeight()
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index e5b62f5..e992aa9 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -662,7 +662,7 @@ export default {
       PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
       productTypeList: [
         { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
+        // { id: 2, name: "柱护板" },
       ],
       isShowHostSN: false,
       isShowVin: false,
@@ -1305,7 +1305,7 @@ export default {
         _name = this.productTypeList[0].name + ': ' + _productLineName
       }
       // 柱护板
-      else if(type == 2){
+      else if(type == 2 && this.productTypeList[1]){
         _name = this.productTypeList[1].name + ': ' + _productLineName + ' (' + this.listQuery.GroupName + ')'
       }
       return _name
diff --git a/vue/src/views/pg-fis/basedate/planControl/index.vue b/vue/src/views/pg-fis/basedate/planControl/index.vue
index d9b554e..c1bdfd9 100644
--- a/vue/src/views/pg-fis/basedate/planControl/index.vue
+++ b/vue/src/views/pg-fis/basedate/planControl/index.vue
@@ -103,7 +103,7 @@
 				/>
 			</el-form-item>
 
-			<el-form-item label="生产线">
+			<el-form-item label="主机厂生产线">
 				<el-select v-model="listQuery.productLine" clearable>
 					<el-option label="A" value="A"></el-option>
 					<el-option label="B" value="B"></el-option>
@@ -322,14 +322,14 @@
 			{ label: "底盘号", prop: "vin", width: 180 },
 			{ label: "序列号", prop: "serialNum", width: 120 },
 			{ label: "流水号", prop: "hostSN", width: 120 },
-			{ label: "生产线", prop: "productLine", width: 120 },
+			{ label: "主机厂生产线", prop: "productLine", width: 130 },
 			{ label: "工厂", prop: "factory", width: 120 },
 			{ label: "工位", prop: "workLocation", width: 120 },
 			{ label: "车位", prop: "vehicleLocation", width: 120 },
 			{ label: "车身号", prop: "vehicleBodyCode", width: 120 },
 			{ label: "车型代码", prop: "vehicleModelCode", width: 180 },
 			{ label: "车型名称", prop: "vehicleModelName", width: 120 },
-			{ label: "车型描述", prop: "vehicleModelDesc", width: 120 },
+			{ label: "车型描述", prop: "vehicleModelDesc", width: 240 },
 			{ label: "规格", prop: "spec", width: 120 },
 			{ label: "规格说明", prop: "specDesc", width: 120 },
 			{ label: "类别", prop: "type", width: 120 },
diff --git a/vue/src/views/pg-fis/basedate/repeatR100/index.vue b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
index 5a4b033..2d33550 100644
--- a/vue/src/views/pg-fis/basedate/repeatR100/index.vue
+++ b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
@@ -13,7 +13,7 @@
       <el-checkbox v-model="listQuery.checked1" >M100</el-checkbox>
       <el-checkbox v-model="listQuery.checked2" >R100</el-checkbox>
         </el-form-item> -->
-          <el-form-item label="数据采集点" prop="State" >
+          <!-- <el-form-item label="数据采集点" prop="State" >
             <el-checkbox-group v-model="listQuery.state">
               <el-checkbox
                 v-for="(item, index) in billState"
@@ -24,7 +24,7 @@
                 {{ item.name }}
               </el-checkbox>
             </el-checkbox-group>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item label="生产线:" prop="productType">
             <el-select
@@ -61,27 +61,27 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="起始顺序号" prop="HostSNBegin">
+          <el-form-item label="起始流水号" prop="HostSNBegin">
             <el-input
               v-model="listQuery.HostSNBegin"
-              placeholder="起始顺序号"
+              placeholder="起始流水号"
               clearable
               size="small"
               style="width: 120px"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="结束顺序号" prop="HostSNEnd">
+          <el-form-item label="结束流水号" prop="HostSNEnd">
             <el-input
               v-model="listQuery.HostSNEnd"
-              placeholder="结束顺序号"
+              placeholder="结束流水号"
               clearable
               size="small"
               style="width: 120px"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="KNR:" prop="KNRBegin">
+          <el-form-item label="车身号:" prop="KNRBegin">
             <el-input
               v-model="listQuery.KNRBegin"
               placeholder=""
@@ -149,7 +149,7 @@
               @keyup.enter.native="handleQuery"
             /> -->
 
-          <el-form-item label="版本" prop="Version">
+          <!-- <el-form-item label="版本" prop="Version">
             <el-input
               v-model="listQuery.Version"
               placeholder="请输入总成名称"
@@ -158,7 +158,7 @@
               style="width: 240px"
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item label="上线日期">
             <el-date-picker
@@ -424,7 +424,7 @@ export default {
         // ],
         productTypeList: [
         { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
+        // { id: 2, name: "柱护板" },
       ],
       showSearch: true,
       bomUnit,
@@ -448,11 +448,12 @@ export default {
   },
   created() {
     //this.getList();
-    this.billState.forEach((element, index) => {
-      if (index === 0) {
-        this.listQuery.state.push(element.id);
-      }
-    });
+    // this.billState.forEach((element, index) => {
+    //   if (index === 0) {
+    //     this.listQuery.state.push(element.id);
+    //   }
+    // });
+    this.listQuery.state.push(3)
     this.getvehicleModel();
     this.getProductLine();
   },
diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
index 603f8b2..05539cd 100644
--- a/vue/src/views/pg-fis/basedate/select/index.vue
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -64,7 +64,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="版本:" prop="Version">
+          <!-- <el-form-item label="版本:" prop="Version">
             <el-input
               v-model="listQuery.Version"
               placeholder=""
@@ -73,9 +73,9 @@
               style="width: 200px"
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
           <!-- </el-row> -->
-          <el-form-item label="流水号:" prop="serialNumBegin">
+          <!-- <el-form-item label="流水号:" prop="serialNumBegin">
             <el-input
               v-model="listQuery.serialNumBegin"
               placeholder=""
@@ -94,9 +94,10 @@
               style="width: 200px"
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
           <!-- <el-row> -->
-          <el-form-item label="大众顺序号:" prop="hostSN">
+          <el-form-item label="流水号:" prop="hostSN">
+          <!-- <el-form-item label="大众顺序号:" prop="hostSN"> -->
             <el-input
               v-model="listQuery.HostSNBegin"
               placeholder=""
@@ -117,7 +118,7 @@
             />
           </el-form-item>
 
-          <el-form-item label="KNR:" prop="KNRBegin">
+          <el-form-item label="车身号:" prop="KNRBegin">
             <el-input
               v-model="listQuery.KNRBegin"
               placeholder=""
@@ -477,7 +478,7 @@ export default {
       billState: [
         { id: 2, name: "未打印" },
         { id: 3, name: "已打印" },
-        { id: 4, name: "不可打印" },
+        // { id: 4, name: "不可打印" },
       ],
       valueSelect: "",
       customerInfos: [],
@@ -587,7 +588,7 @@ export default {
       PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
       productTypeList: [
         { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
+        // { id: 2, name: "柱护板" },
       ],
       isShowHostSN: false,
       isShowVin: false,
@@ -595,6 +596,13 @@ export default {
     };
   },
   mounted() {
+// 查询条件20240117更改（只改文字，参数不变）
+// - 生产线 去掉 柱护板 选项
+// - 隐藏 版本 
+// - 隐藏 流水号
+// - 大众顺序号 改成 流水号
+// - KNR 改成 车身号
+// - 隐藏 不可打印
     let _this = this
     window.addEventListener('resize',function(){
       _this.changeMainTableHeight()
diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
index d103361..f859c51 100644
--- a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
@@ -9,7 +9,17 @@
           v-show="showSearch"
           :inline="true"
         >
-          <el-form-item label="KNR:" prop="KNRBegin">
+        <el-form-item label="流水号:" prop="HostSN2">
+            <el-input
+              v-model="listQuery.HostSN2"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="车身号:" prop="KNRBegin">
             <el-input
               v-model="listQuery.KNRBegin"
               placeholder=""
@@ -69,7 +79,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="版本" prop="Version">
+          <!-- <el-form-item label="版本" prop="Version">
             <el-input
               v-model="listQuery.Version"
               placeholder="请输入版本"
@@ -78,7 +88,7 @@
               style="width: 240px"
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item label="上线日期">
             <el-date-picker
@@ -106,7 +116,7 @@
             </el-button>
           </el-form-item>
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button
               class="addAssy"
               size="mini"
@@ -115,9 +125,9 @@
               @click="handleCreate"
               >添加总成
             </el-button>
-          </el-form-item>
+          </el-form-item> -->
 
-          <el-form-item label="扫描点" prop="ScanPoint">
+          <!-- <el-form-item label="扫描点" prop="ScanPoint">
             <el-select
               v-model="listQuery.ScanPoint"
               placeholder="请选择"
@@ -131,7 +141,7 @@
                 :value="item.id"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item>
             <el-button
@@ -613,7 +623,7 @@ export default {
         OnlineTimeEnd: undefined,
         KNR: undefined,
         VIN: undefined,
-        ScanPoint: undefined,
+        ScanPoint: 'M100',
         BillDescription: undefined,
       },
       listUnknownAssemblyQuery: {
@@ -695,6 +705,13 @@ export default {
     };
   },
   mounted() {
+    // 20240117修改
+// 1. 查询条件
+// - 加 流水号 筛选条件，数据表字段对应 HostSN2 
+// - KNR 查询条件 改成 车身号
+// - 隐藏 版本号
+// - 隐藏 扫描点， 默认传值 M100，
+// 2. 去掉 添加总成 按钮
     this.$nextTick(() => {
       var offsetHei = document.documentElement.clientHeight;
       //console.log(offsetHei);