diff --git a/src/views/supermarketerp/stockTaking/form.vue b/src/views/supermarketerp/stockTaking/form.vue
index 5082301..70728ba 100644
--- a/src/views/supermarketerp/stockTaking/form.vue
+++ b/src/views/supermarketerp/stockTaking/form.vue
@@ -9,27 +9,9 @@
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" />
 					</el-form-item>
-					<el-form-item label="关联采购订单" prop="linkCode">
-						<el-input
-							v-model="baseDataForm.linkCode"
-							:suffix-icon="Search"
-							@click="handleClickLinkCode"
-							readonly
-							placeholder="请选择采购订单"
-							style="width: 200px"
-						/>
-					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
-							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="货商" prop="supplierId">
-						<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" />
-					</el-form-item>
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" />
 					</el-form-item>
@@ -88,7 +70,8 @@
 			>
 				<vxe-column type="checkbox" width="40" fixed="left" />
 				<vxe-column type="seq" width="50" fixed="left" />
-				<vxe-column field="productName" title="库存商品">
+        <vxe-column field="productCode" title="货号编码"/>
+				<vxe-column field="productName" title="商品名称">
 					<template #default="{ row }">
 						<span v-if="row.productName">{{ row.productName }}</span>
 						<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
@@ -112,12 +95,27 @@
 						<span v-else style="color: #c0c4cf">请选择</span>
 					</template>
 				</vxe-column>
-				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+				<vxe-column field="currentStock" title="账面数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.quantity" />
 					</template>
 				</vxe-column>
-				<vxe-column field="unitPrice" title="进价">
+        <vxe-column field="currentStock" title="实际数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+          <template #edit="{ row }">
+            <el-input v-model="row.quantity" />
+          </template>
+        </vxe-column>
+        <vxe-column field="profit" title="盈" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+          <template #edit="{ row }">
+            <el-input v-model="row.quantity" />
+          </template>
+        </vxe-column>
+        <vxe-column field="loss" title="亏" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+          <template #edit="{ row }">
+            <el-input v-model="row.quantity" />
+          </template>
+        </vxe-column>
+				<vxe-column field="unitPrice" title="账面进价">
 					<template #default="{ row }">
 						{{
 							row.purchasePrice
@@ -126,7 +124,17 @@
 						}}
 					</template>
 				</vxe-column>
-				<vxe-column field="totalAmount" title="累计总金额">
+        <vxe-column field="pdPrice" title="盘点单价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+          <template #edit="{ row }">
+            <el-input v-model="row.quantity" />
+          </template>
+        </vxe-column>
+        <vxe-column field="pdTotalNum" title="盘后总数" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+          <template #edit="{ row }">
+            <el-input v-model="row.quantity" />
+          </template>
+        </vxe-column>
+				<vxe-column field="totalAmount" title="盘后总金额">
 					<template #default="{ row }">
 						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
 							{{ displayPrice(row.quantity * parseFloat(row.purchasePrice)) }}
@@ -211,8 +219,8 @@ const baseDataForm = reactive<any>({
 	checkTime: "",
 	supplierId: "",
 	remark: "",
-	inventoryType: "3",
-	orderType: "1",
+	inventoryType: "7",
+	orderType: "",
 	totalAmount: "",
 })
 const state = reactive<{
@@ -269,7 +277,7 @@ const getInitData = async () => {
 	}
 
 	// 获取采购入库编号
-	const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 3 })]).then((results) =>
+	const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 7 })]).then((results) =>
 		results.map((result) => (result.status === "fulfilled" ? result.value : null)),
 	)
 	erpSpuSimpleAll && erpSpuSimpleAll.code === 0 && (state.erpSpuSimpleAll = erpSpuSimpleAll.data)