diff --git a/src/views/cost/feeRecords/index.vue b/src/views/cost/feeRecords/index.vue
new file mode 100644
index 0000000..4fba3f0
--- /dev/null
+++ b/src/views/cost/feeRecords/index.vue
@@ -0,0 +1,28 @@
+<template>
+	<el-container class="mainBox mainHeaderNoBorderPadding">
+		<el-main class="nopadding">
+			费用流水明细
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "index",
+	data(){
+		return{
+
+		}
+	},
+	mounted() {
+
+	},
+	methods:{
+
+	}
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/order/inventoryList/index.vue b/src/views/order/inventoryList/index.vue
index 18b347a..2025a60 100644
--- a/src/views/order/inventoryList/index.vue
+++ b/src/views/order/inventoryList/index.vue
@@ -1,24 +1,5 @@
 <template>
 	<el-container class="mainBox mainBoxHeaderNoBorder">
-<!--		<el-header>-->
-<!--			<div class="left-panel">-->
-<!--				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增库存</el-button>-->
-<!--				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">-->
-<!--					<template #header>-->
-<!--						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>-->
-<!--					</template>-->
-<!--					<template #download>-->
-<!--						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>-->
-<!--					</template>-->
-<!--				</scImport>-->
-<!--			</div>-->
-<!--			<div class="right-panel">-->
-<!--				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">-->
-<!--					<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>-->
-<!--				</scExport>-->
-<!--			</div>-->
-<!--		</el-header>-->
-<!--		searchMainNoTop-->
 		<el-main class="nopadding">
 			<div class="searchMain">
 				<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
@@ -88,16 +69,20 @@ export default {
 			exportShow:false,
 			searchShow:false,
 			searchList:[
-				{name:'生产日期',type:'date',code:'activation_date',show:true},
-				{name:'反厂日期',type:'date',code:'activation_date',show:true},
-				{name:'处理时间',type:'date',code:'activation_date',show:true},
-				{name:'客户名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称",show:false},
-				{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",show:false},
-				{name:'工单号',type:'text',code:['mobile'],placeholder:"请输入手机号",isOpen:true,show:false},
-				{name:'邮件地址',type:'text',code:['email'],placeholder:"请输入邮箱地址",isOpen:true,show:false},
-				{name:'公司地址',type:'text',code:['address'],placeholder:"请输入公司地址",isOpen:true,show:false},
-				{name:'负责人',type:'text',code:['owner'],placeholder:"请输入负责人",isOpen:true,show:false},
-				{name:'关键字',type:'text',code:['domain','name'],keyword:true,show:true},
+				{name:'仓库编码',type:'text',code:['f_stock_id'],placeholder:"请输入仓库编码",isOpen:true,show:true},
+				{name:'计划跟踪号',type:'text',code:['f_mto_no'],placeholder:"请输入计划跟踪号",isOpen:true,show:false},
+				{name:'生产日期',type:'date',code:'f_produce_date',show:true},
+				{name:'库存量(基本单位)',type:'text',code:['f_base_qty'],placeholder:"请输入库存量(基本单位)",isOpen:true,show:false},
+				{name:'预留量(基本单位)',type:'text',code:['f_base_lock_qty'],placeholder:"请输入预留量(基本单位)",isOpen:true,show:false},
+				{name:'库存量(库存辅单位)',type:'select',code:'f_sec_qty', data:[], placeholder:"请选择库存量(库存辅单位)",isOpen:true,show:false},
+				{name:'预留量(辅单位)',type:'select',code:'f_sec_lock_qty', data:[], placeholder:"请选择预留量(辅单位)",isOpen:true,show:false},
+				{name:'库存主单位编码',type:'text',code:['f_stock_unit_id'],placeholder:"请输入库存主单位编码",isOpen:true,show:false},
+				{name:'编码',type:'text',code:['f_material_id'],placeholder:"请输入编码",isOpen:true,show:false},
+				{name:'可用量(基本单位)',type:'text',code:['f_base_avb_qty'],placeholder:"请输入可用量(基本单位)",isOpen:true,show:false},
+				{name:'实体主键',type:'text',code:['f_id'],placeholder:"请输入实体主键",isOpen:true,show:false},
+				{name:'BOM版本编码',type:'text',code:['f_bom_id'],placeholder:"请输入BOM版本编码",isOpen:true,show:false},
+				{name:'创建日期',type:'date',code:'created_at',show:true},
+				{name:'关键字',type:'text',code:['name'],keyword:true,show:true},
 			],
 			params: {},
 		}
@@ -111,39 +96,30 @@ export default {
 				}
 			})
 		},
-		getSelectData(item){
-			let {data,params} = item;
+		async getSelectData(item) {
+			let {data, params} = item;
 			this.params = params;
-			if(data.code == "id"){
-				this.getCompanyList(data,params)
-			}else if(data.code == "active_status"){
-				this.getStatusList(data,params);
+			let searchParams = this.$TOOL.objCopy(params);
+			searchParams.field = ""
+			if (typeof data.code === 'string') {
+				searchParams.field = data.code;
+			} else {
+				searchParams.field = data.code[0];
 			}
-		},
-
-		async getCompanyList(data,params) {
-			const res = await this.$API.system.company.select.post(params);
-			if(res.data && res.data.length>0){
-				res.data.forEach(item=>{
-					item.label = item.full_name;
-				})
-			}
-			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
+			if (data.type == 'select') {
+				const res = await this.$API.orders.order.sock.field.post(searchParams);
+				if (res.code == 200) {
+					if (res.data && res.data.length > 0) {
+						res.data.forEach(item => {
+							item.label = item[data.code];
+						})
 					}
-				})
-			}
-		},
-		async getStatusList(data,params) {
-			const res = await this.$API.oss.status.post(params);
-			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
-					}
-				})
+					this.searchList.forEach(item => {
+						if (item.code == data.code) {
+							item.data = res.data;
+						}
+					})
+				}
 			}
 		},
 
diff --git a/src/views/shipment/shipmentList/index.vue b/src/views/shipment/shipmentList/index.vue
index 1e82d8e..2c6bc25 100644
--- a/src/views/shipment/shipmentList/index.vue
+++ b/src/views/shipment/shipmentList/index.vue
@@ -1,23 +1,5 @@
 <template>
 	<el-container class="mainBox mainBoxHeaderNoBorder">
-<!--		<el-header>-->
-<!--			<div class="left-panel">-->
-<!--				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增工单</el-button>-->
-<!--				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">-->
-<!--					<template #header>-->
-<!--						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>-->
-<!--					</template>-->
-<!--					<template #download>-->
-<!--						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>-->
-<!--					</template>-->
-<!--				</scImport>-->
-<!--			</div>-->
-<!--			<div class="right-panel">-->
-<!--				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">-->
-<!--					<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>-->
-<!--				</scExport>-->
-<!--			</div>-->
-<!--		</el-header>-->
 		<el-main class="nopadding">
 			<div class="searchMain">
 				<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
@@ -87,16 +69,16 @@ export default {
 			exportShow:false,
 			searchShow:false,
 			searchList:[
-				{name:'生产日期',type:'date',code:'activation_date',show:true},
-				{name:'反厂日期',type:'date',code:'activation_date',show:true},
-				{name:'处理时间',type:'date',code:'activation_date',show:true},
-				{name:'客户名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称",show:false},
-				{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",show:false},
-				{name:'工单号',type:'text',code:['mobile'],placeholder:"请输入手机号",isOpen:true,show:false},
-				{name:'邮件地址',type:'text',code:['email'],placeholder:"请输入邮箱地址",isOpen:true,show:false},
-				{name:'公司地址',type:'text',code:['address'],placeholder:"请输入公司地址",isOpen:true,show:false},
-				{name:'负责人',type:'text',code:['owner'],placeholder:"请输入负责人",isOpen:true,show:false},
-				{name:'关键字',type:'text',code:['domain','name'],keyword:true,show:true},
+				{name:'实体主键',type:'text',code:['f_id'],placeholder:"请输入实体主键",isOpen:true,show:false},
+				{name:'单据编号',type:'text',code:['f_bill_no'],placeholder:"请输入单据编号",isOpen:true,show:false},
+				{name:'日期',type:'date',code:'f_date',show:true},
+				{name:'收货方地址',type:'text',code:['f_receive_address'],placeholder:"请输入收货方地址",isOpen:true,show:false},
+				{name:'客户名称',type:'select',code:['f_customer_id'],data:[],placeholder:"请选择客户名称",isOpen:true,show:false},
+				{name:'物料编码',type:'text',code:['f_material_id'],placeholder:"请输入物料编码",isOpen:true,show:false},
+				{name:'实发数量',type:'text',code:['f_real_qty'],placeholder:"请输入实发数量",isOpen:true,show:false},
+				{name:'应发数量',type:'text',code:['f_must_qty'],placeholder:"请输入应发数量",isOpen:true,show:false},
+				{name:'创建日期',type:'date',code:'created_at',show:true},
+				{name:'关键字',type:'text',code:['name'],keyword:true,show:true},
 			],
 			params: {},
 		}
@@ -110,39 +92,30 @@ export default {
 				}
 			})
 		},
-		getSelectData(item){
-			let {data,params} = item;
+		async getSelectData(item) {
+			let {data, params} = item;
 			this.params = params;
-			if(data.code == "id"){
-				this.getCompanyList(data,params)
-			}else if(data.code == "active_status"){
-				this.getStatusList(data,params);
+			let searchParams = this.$TOOL.objCopy(params);
+			searchParams.field = ""
+			if (typeof data.code === 'string') {
+				searchParams.field = data.code;
+			} else {
+				searchParams.field = data.code[0];
 			}
-		},
-
-		async getCompanyList(data,params) {
-			const res = await this.$API.system.company.select.post(params);
-			if(res.data && res.data.length>0){
-				res.data.forEach(item=>{
-					item.label = item.full_name;
-				})
-			}
-			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
+			if (data.type == 'select') {
+				const res = await this.$API.orders.order.out.field.post(searchParams);
+				if (res.code == 200) {
+					if (res.data && res.data.length > 0) {
+						res.data.forEach(item => {
+							item.label = item[data.code];
+						})
 					}
-				})
-			}
-		},
-		async getStatusList(data,params) {
-			const res = await this.$API.oss.status.post(params);
-			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
-					}
-				})
+					this.searchList.forEach(item => {
+						if (item.code == data.code) {
+							item.data = res.data;
+						}
+					})
+				}
 			}
 		},