diff --git a/src/views/qm/behavior.vue b/src/views/qm/behavior.vue
index 2a0280bf..a523a449 100644
--- a/src/views/qm/behavior.vue
+++ b/src/views/qm/behavior.vue
@@ -11,7 +11,7 @@
 				>
 			</div>
 			<div class="right-panel">
-				<el-select
+				<!-- <el-select
 					v-model="query.testitem"
 					clearable
 					style="width: 150px"
@@ -24,7 +24,7 @@
 						:value="item.id"
 					>
 					</el-option>
-				</el-select>
+				</el-select> -->
 				<el-date-picker
 					v-model="query.test_date"
 					type="date"
@@ -45,156 +45,131 @@
 				>
 			</div>
 		</el-header>
-		<scTable
-			ref="table"
-			:data="tableData"
-			:apiObj="apiObj"
-			row-key="id"
-			stripe
-			:params="query"
-			:query="query"
-		>
-			<el-table-column type="index" width="50" />
-			<el-table-column
-				label="实验日期"
-				prop="test_date"
-				show-overflow-tooltip
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:data="tableData"
+				:apiObj="apiObj"
+				row-key="id"
+				stripe
+				:params="query"
+				:query="query"
 			>
-			</el-table-column>
-			<el-table-column label="样品编号" prop="sample_number">
-			</el-table-column>
-			<el-table-column
-				label="样品厚度/mm"
-				prop="val_hd"
-				v-if="activeName == '透过率'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="型号规格"
-				prop="specification"
-				v-if="
-					activeName == '中温粘度' || activeName == '膨胀'
-				"
-			>
-			</el-table-column>
-			<el-table-column
-				label="样品数量"
-				prop="sample_count"
-				v-if="activeName == '析晶'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="样品密度"
-				prop="sample_density"
-				v-if="activeName == '高温粘度'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="检验员"
-				prop="test_user_name"
-				show-overflow-tooltip
-			>
-			</el-table-column>
-			<el-table-column
-				label="实验温度及保温时间"
-				prop="sample_number"
-				v-if="activeName == '析晶'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="升至最高温度/℃"
-				prop="val_zgwd"
-				v-if="activeName == '高温粘度'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="仪器状态"
-				prop="factory"
-				show-overflow-tooltip
-			>
-				<template #default="scope">
-					<el-tag>{{
-						state_[scope.row.equip_state]
-					}}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column
-				label="折射率(589nm)"
-				prop="val_zsl"
-				v-if="activeName == '折射率'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="透过率(550nm)"
-				prop="val_tgl"
-				v-if="activeName == '透过率'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="Ts/℃"
-				prop="val_ts"
-				v-if="activeName == '中温粘度'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="30-300℃膨胀系数"
-				prop="val_pzxs"
-				v-if="activeName == '膨胀'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="Tg/℃"
-				prop="val_tg"
-				v-if="activeName == '膨胀'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="Tf/℃"
-				prop="val_tf"
-				v-if="activeName == '膨胀'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="析晶"
-				prop="val_xj"
-				v-if="activeName == '析晶'"
-			>
-				<template #default="scope">
-					<el-tag>{{
-						state_xj[scope.row.val_xj]
-					}}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作" fixed="right" width="160">
-				<template #default="scope">
-					<el-link
-						type="primary"
-						@click="table_edit(scope.row)"
-						v-auth="'ptest.update'"
-						>编辑</el-link
-					>
-					<el-divider
-						direction="vertical"
-						v-auth="'ptest.update'"
-					></el-divider>
-					<el-link
-						type="primary"
-						@click="table_show(scope.row)"
-						>查看</el-link
-					>
-					<el-divider
-						direction="vertical"
-						v-auth="'ptest.delete'"
-					></el-divider>
-					<el-link
-						type="danger"
-						@click="table_del(scope.row)"
-						v-auth="'ptest.delete'"
-						>删除</el-link
-					>
-				</template>
-			</el-table-column>
-		</scTable>
+				<el-table-column type="index" width="50" />
+				<el-table-column label="样品编号" prop="sample_number" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column label="实验日期" prop="test_date" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column
+					label="仪器状态"
+					prop="factory"
+					show-overflow-tooltip
+				>
+					<template #default="scope">
+						<el-tag>{{state_[scope.row.equip_state]}}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="折射率(589nm)"
+					prop="val_zsl"
+				>
+				</el-table-column>
+				<el-table-column
+					label="样品厚度/mm"
+					prop="val_hd"
+				>
+				</el-table-column>
+				<el-table-column
+					label="透过率(550nm)"
+					prop="val_tgl"
+				>
+				</el-table-column>
+				<el-table-column
+					label="Ts/℃"
+					prop="val_ts"
+				>
+				</el-table-column>
+				<el-table-column
+					label="型号规格"
+					prop="specification"
+				>
+				</el-table-column>
+				<el-table-column
+					label="30-300℃膨胀系数"
+					prop="val_pzxs"
+				>
+				</el-table-column>
+				<el-table-column
+					label="Tg/℃"
+					prop="val_tg"
+				>
+				</el-table-column>
+				<el-table-column
+					label="Tf/℃"
+					prop="val_tf"
+				>
+				</el-table-column>
+				<el-table-column
+					label="样品数量"
+					prop="sample_count"
+				>
+				</el-table-column>
+				<el-table-column
+					label="析晶"
+					prop="val_xj"
+				>
+					<template #default="scope">
+						<el-tag>{{state_xj[scope.row.val_xj]}}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="样品密度"
+					prop="sample_density"
+				>
+				</el-table-column>
+				<el-table-column
+					label="升至最高温度/℃"
+					prop="val_zgwd"
+				>
+				</el-table-column>
+				<el-table-column
+					label="检验员"
+					prop="test_user_name"
+					show-overflow-tooltip
+				>
+				</el-table-column>
+				<el-table-column label="操作" fixed="right" width="160">
+					<template #default="scope">
+						<el-link
+							type="primary"
+							@click="table_edit(scope.row)"
+							v-auth="'ptest.update'"
+							>编辑</el-link
+						>
+						<el-divider
+							direction="vertical"
+							v-auth="'ptest.update'"
+						></el-divider>
+						<el-link
+							type="primary"
+							@click="table_show(scope.row)"
+							>查看</el-link
+						>
+						<el-divider
+							direction="vertical"
+							v-auth="'ptest.delete'"
+						></el-divider>
+						<el-link
+							type="danger"
+							@click="table_del(scope.row)"
+							v-auth="'ptest.delete'"
+							>删除</el-link
+						>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+		
 		<save-dialog
 			v-if="visible"
 			ref="saveDialog"
@@ -269,7 +244,7 @@ export default {
 					},
 				],
 			},
-			activeName: "折射率",
+			// activeName: "折射率",
 			visible: false,
 			isSaveing: false,
 			selection: [],
@@ -288,7 +263,7 @@ export default {
 				.get({ tags__contains: "performance", page: 0 })
 				.then((res) => {
 					that.behaviors = res;
-					that.query.testitem = res[0].id;
+					// that.query.testitem = res[0].id;
 					that.apiObj = that.$API.qm.ptest.list;
 				});
 		},
diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue
index aba5e66f..e1e06d22 100644
--- a/src/views/qm/behavior_form.vue
+++ b/src/views/qm/behavior_form.vue
@@ -15,24 +15,6 @@
 					label-width="160px"
 				>
 					<el-row>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="检验类型" prop="testitem">
-								<el-select
-									v-model="form.testitem"
-									placeholder="检验类型"
-									clearable
-									style="width: 100%"
-									@change="testitemChange"
-								>
-									<el-option
-										v-for="item in behaviors"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									/>
-								</el-select>
-							</el-form-item>
-						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="实验日期" prop="test_date">
 								<el-date-picker
@@ -50,101 +32,6 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '透过率'">
-							<el-form-item label="样品厚度/mm" prop="val_hd">
-								<el-input-number
-									v-model="form.val_hd"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-							</el-form-item>
-						</el-col>
-						<el-col
-							:md="12"
-							:sm="24"
-							v-if="
-								activeName == '中温粘度' || activeName == '膨胀'
-							"
-						>
-							<el-form-item label="规格型号" prop="specification">
-								<el-input
-									v-model="form.specification"
-								></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '析晶'">
-							<el-form-item label="样品数量" prop="sample_count">
-								<el-input-number
-									v-model="form.sample_count"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-							</el-form-item>
-						</el-col>
-						<el-col
-							:md="12"
-							:sm="24"
-							v-if="activeName == '高温粘度'"
-						>
-							<el-form-item
-								label="样品密度"
-								prop="sample_density"
-							>
-								<el-input
-									v-model="form.sample_density"
-								></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="检验员" prop="test_user">
-								<el-select
-									v-model="form.test_user"
-									placeholder="检验员"
-									clearable
-									filterable
-									style="width: 100%"
-								>
-									<el-option
-										v-for="item in userList"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									/>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '析晶'">
-							<el-form-item
-								label="实验温度及保温时间"
-								prop="sample_density"
-							>
-								<el-input
-									v-model="form.sample_number"
-								></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col
-							:md="12"
-							:sm="24"
-							v-if="activeName == '高温粘度'"
-						>
-							<el-form-item
-								label="升至最高温度/℃"
-								prop="val_zgwd"
-							>
-								<el-input-number
-									v-model="form.val_zgwd"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-							</el-form-item>
-						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="仪器状态" prop="equip_state">
 								<el-select
@@ -163,7 +50,43 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '折射率'">
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验员" prop="test_user">
+								<el-select
+									v-model="form.test_user"
+									placeholder="检验员"
+									clearable
+									filterable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in userList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="样品厚度/mm" prop="val_hd">
+								<el-input-number
+									v-model="form.val_hd"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="规格型号" prop="specification">
+								<el-input
+									v-model="form.specification"
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
 							<el-form-item label="折射率(589nm)" prop="val_zsl">
 								<el-input-number
 									v-model="form.val_zsl"
@@ -174,7 +97,7 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '透过率'">
+						<el-col :md="12" :sm="24">
 							<el-form-item label="透过率(550nm)" prop="val_tgl">
 								<el-input-number
 									v-model="form.val_tgl"
@@ -185,11 +108,18 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col
-							:md="12"
-							:sm="24"
-							v-if="activeName == '中温粘度'"
-						>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="30-300℃膨胀系数" prop="val_pzxs">
+								<el-input-number
+									v-model="form.val_pzxs"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
 							<el-form-item label="Ts/℃" prop="val_ts">
 								<el-input-number
 									v-model="form.val_ts"
@@ -200,21 +130,8 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
-							<el-form-item
-								label="30-300℃膨胀系数"
-								prop="val_pzxs"
-							>
-								<el-input-number
-									v-model="form.val_pzxs"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
+						
+						<el-col :md="12" :sm="24">
 							<el-form-item label="Tg/℃" prop="val_tg">
 								<el-input-number
 									v-model="form.val_tg"
@@ -225,7 +142,7 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
+						<el-col :md="12" :sm="24">
 							<el-form-item label="Tf/℃" prop="val_tf">
 								<el-input-number
 									v-model="form.val_tf"
@@ -236,7 +153,7 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '析晶'">
+						<el-col :md="12" :sm="24">
 							<el-form-item label="析晶状态" prop="val_xj">
 								<el-select
 									v-model="form.val_xj"
@@ -254,6 +171,51 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="样品数量" prop="sample_count">
+								<el-input-number
+									v-model="form.sample_count"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<!-- <el-col :md="12" :sm="24">
+							<el-form-item
+								label="实验温度及保温时间"
+								prop="sample_density"
+							>
+								<el-input
+									v-model="form.sample_number"
+								></el-input>
+							</el-form-item>
+						</el-col> -->
+						<el-col :md="12" :sm="24">
+							<el-form-item
+								label="样品密度"
+								prop="sample_density"
+							>
+								<el-input
+									v-model="form.sample_density"
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item
+								label="升至最高温度/℃"
+								prop="val_zgwd"
+							>
+								<el-input-number
+									v-model="form.val_zgwd"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="备注">
 								<el-input
@@ -283,7 +245,8 @@ export default {
 	data() {
 		return {
 			loading: false,
-			form: {},
+			form: {
+			},
 			rules: {
 				belong_dept: [
 					{
@@ -354,7 +317,6 @@ export default {
 	mounted() {
 		console.log(this.activeId);
 		console.log(this.activeName);
-		this.form.testitem = this.activeId;
 		this.getTextItem();
 		this.getProcess();
 		this.getUserList();
@@ -371,7 +333,7 @@ export default {
 		getTextItem() {
 			let that = this;
 			that.$API.qm.getTestItem
-				.get({ tag: "performance", page: 0 })
+				.get({ tags__contains: "performance", page: 0 })
 				.then((res) => {
 					that.behaviors = res;
 				});
@@ -416,14 +378,9 @@ export default {
 					try {
 						var res;
 						if (this.mode == "add") {
-							res = await this.$API.qm.ptest.create.req(
-								this.form
-							);
+							res = await this.$API.qm.ptest.create.req(this.form);
 						} else if (this.mode == "edit") {
-							res = await this.$API.qm.ptest.update.req(
-								this.form.id,
-								this.form
-							);
+							res = await this.$API.qm.ptest.update.req(this.form.id,this.form);
 						}
 						this.isSaveing = false;
 						this.$emit("success");