diff --git a/src/api/mes/wm/stocktaking/task/index.ts b/src/api/mes/wm/stocktaking/task/index.ts
index a33d38d8e..61bbb68bf 100644
--- a/src/api/mes/wm/stocktaking/task/index.ts
+++ b/src/api/mes/wm/stocktaking/task/index.ts
@@ -20,10 +20,6 @@ export interface StockTakingTaskVO {
   createTime?: string
 }
 
-export interface StockTakingTaskActionReqVO {
-  id: number
-}
-
 export const StockTakingApi = {
   getStockTakingPage: async (params: any) => {
     return await request.get({ url: '/mes/wm/stocktaking-task/page', params })
@@ -45,12 +41,12 @@ export const StockTakingApi = {
     return await request.delete({ url: '/mes/wm/stocktaking-task/delete?id=' + id })
   },
 
-  submitStockTaking: async (data: StockTakingTaskActionReqVO) => {
-    return await request.put({ url: '/mes/wm/stocktaking-task/submit', data })
+  submitStockTaking: async (id: number) => {
+    return await request.put({ url: '/mes/wm/stocktaking-task/submit', params: { id } })
   },
 
-  cancelStockTaking: async (data: StockTakingTaskActionReqVO) => {
-    return await request.put({ url: '/mes/wm/stocktaking-task/cancel', data })
+  cancelStockTaking: async (id: number) => {
+    return await request.put({ url: '/mes/wm/stocktaking-task/cancel', params: { id } })
   },
 
   exportStockTaking: async (params: any) => {
diff --git a/src/api/mes/wm/stocktaking/task/line/index.ts b/src/api/mes/wm/stocktaking/task/line/index.ts
index e6b4eb4bc..9a0c8b8d0 100644
--- a/src/api/mes/wm/stocktaking/task/line/index.ts
+++ b/src/api/mes/wm/stocktaking/task/line/index.ts
@@ -29,6 +29,10 @@ export const StockTakingTaskLineApi = {
     return await request.get({ url: '/mes/wm/stocktaking-task-line/page', params })
   },
 
+  getStockTakingTaskLine: async (id: number) => {
+    return await request.get({ url: '/mes/wm/stocktaking-task-line/get', params: { id } })
+  },
+
   createStockTakingTaskLine: async (data: StockTakingTaskLineVO) => {
     return await request.post({ url: '/mes/wm/stocktaking-task-line/create', data })
   },
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue b/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue
index 6bb0cf687..097217b1e 100644
--- a/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue
+++ b/src/views/mes/wm/stocktaking/task/StockTakingTaskLineList.vue
@@ -6,119 +6,123 @@
       v-hasPermi="['mes:wm-stock-taking-task:update']"
       type="primary"
       plain
-      @click="handleAdd"
+      @click="openForm('create')"
       class="mb-10px"
     >
       <Icon icon="ep:plus" class="mr-5px" /> 添加物料
     </el-button>
-    <el-table
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      border
-    >
-      <el-table-column label="物料编码" prop="itemCode" min-width="140" />
-      <el-table-column label="物料名称" prop="itemName" min-width="160" />
-      <el-table-column label="规格型号" prop="specification" min-width="120" />
-      <el-table-column label="单位" prop="unitMeasureName" width="90" />
-      <el-table-column label="在库数量" prop="quantity" width="120" />
-      <el-table-column label="仓库" prop="warehouseName" min-width="120" />
-      <el-table-column label="库区" prop="locationName" min-width="120" />
-      <el-table-column label="库位" prop="areaName" min-width="120" />
-      <el-table-column label="状态" min-width="100">
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
+      <el-table-column label="物料编码" align="center" prop="itemCode" min-width="140" />
+      <el-table-column label="物料名称" align="center" prop="itemName" min-width="160" />
+      <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
+      <el-table-column label="单位" align="center" prop="unitMeasureName" width="90" />
+      <el-table-column label="在库数量" align="center" prop="quantity" width="120" />
+      <el-table-column label="仓库" align="center" prop="warehouseName" min-width="120" />
+      <el-table-column label="库区" align="center" prop="locationName" min-width="120" />
+      <el-table-column label="库位" align="center" prop="areaName" min-width="120" />
+      <el-table-column label="状态" align="center" min-width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_WM_STOCK_TAKING_LINE_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column v-if="!isReadOnly" label="操作" width="160" fixed="right">
+      <el-table-column v-if="!isReadOnly" label="操作" align="center" width="160" fixed="right">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="handleEdit(scope.row)"
-            v-hasPermi="['mes:wm-stock-taking-task:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['mes:wm-stock-taking-task:update']"
-          >
-            删除
-          </el-button>
+          <el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-
     <Pagination
       :total="total"
       v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
-      <el-form
-        ref="formRef"
-        :model="formData"
-        :rules="formRules"
-        label-width="100px"
-        v-loading="formLoading"
-      >
-        <el-form-item label="物料" prop="itemId">
-          <MdItemSelect v-model="formData.itemId" placeholder="请选择物料" class="!w-full" />
-        </el-form-item>
-        <el-form-item label="仓库" prop="warehouseId">
-          <WmWarehouseSelect v-model="formData.warehouseId" placeholder="请选择仓库" class="!w-full" />
-        </el-form-item>
-        <el-form-item label="库区" prop="locationId">
-          <WmWarehouseLocationSelect
-            v-model="formData.locationId"
-            :warehouse-id="formData.warehouseId"
-            placeholder="请选择库区"
-            class="!w-full"
-          />
-        </el-form-item>
-        <el-form-item label="库位" prop="areaId">
-          <WmWarehouseAreaSelect
-            v-model="formData.areaId"
-            :location-id="formData.locationId"
-            placeholder="请选择库位"
-            class="!w-full"
-          />
-        </el-form-item>
-        <el-form-item label="在库数量" prop="quantity">
-          <el-input-number
-            v-model="formData.quantity"
-            :precision="2"
-            :min="0"
-            controls-position="right"
-            class="!w-full"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="formData.status" placeholder="请选择状态" class="!w-full">
-            <el-option
-              v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_LINE_STATUS)"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
-      </template>
-    </Dialog>
   </div>
+
+  <!-- 添加/编辑行弹窗 -->
+  <!-- TODO @芋艿：后续要改成 stockSelect 批量选择后，进行处理； -->
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+      v-loading="formLoading"
+    >
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="物料" prop="itemId">
+            <MdItemSelect v-model="formData.itemId" placeholder="请选择物料" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="在库数量" prop="quantity">
+            <el-input-number
+              v-model="formData.quantity"
+              :precision="2"
+              :min="0"
+              controls-position="right"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="formData.status" placeholder="请选择状态">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_STOCK_TAKING_LINE_STATUS)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="仓库" prop="warehouseId">
+            <WmWarehouseSelect
+              v-model="formData.warehouseId"
+              placeholder="请选择仓库"
+              @change="handleWarehouseChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="formData.warehouseId">
+          <el-form-item label="库区" prop="locationId">
+            <WmWarehouseLocationSelect
+              v-model="formData.locationId"
+              :warehouse-id="formData.warehouseId"
+              placeholder="请选择库区"
+              @change="handleLocationChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="formData.locationId">
+          <el-form-item label="库位" prop="areaId">
+            <WmWarehouseAreaSelect
+              v-model="formData.areaId"
+              :location-id="formData.locationId"
+              placeholder="请选择库位"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
 </template>
 
 <script setup lang="ts">
@@ -139,10 +143,12 @@ const props = defineProps<{
   formType?: string
 }>()
 
-const message = useMessage()
 const { t } = useI18n()
+const message = useMessage()
 
 const isReadOnly = computed(() => props.formType === 'detail')
+
+// ==================== 列表 ====================
 const loading = ref(false)
 const list = ref<StockTakingTaskLineVO[]>([])
 const total = ref(0)
@@ -152,31 +158,7 @@ const queryParams = reactive({
   taskId: undefined as number | undefined
 })
 
-const dialogVisible = ref(false)
-const dialogTitle = ref('')
-const formLoading = ref(false)
-const dialogFormType = ref('')
-const formRef = ref()
-
-const formData = ref({
-  id: undefined,
-  taskId: undefined,
-  itemId: undefined,
-  warehouseId: undefined,
-  locationId: undefined,
-  areaId: undefined,
-  quantity: undefined,
-  status: undefined,
-  remark: undefined
-})
-
-const formRules = reactive({
-  itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
-  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
-  quantity: [{ required: true, message: '在库数量不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
-})
-
+/** 查询行列表 */
 const getList = async () => {
   if (!props.taskId) return
   loading.value = true
@@ -190,25 +172,67 @@ const getList = async () => {
   }
 }
 
-const handleAdd = () => {
+/** 删除 */
+const handleDelete = async (id: number) => {
+  try {
+    await message.delConfirm()
+    await StockTakingTaskLineApi.deleteStockTakingTaskLine(id)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch {}
+}
+
+// ==================== 添加/编辑表单 ====================
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const dialogFormType = ref('')
+const formData = ref({
+  id: undefined,
+  taskId: undefined as number | undefined,
+  itemId: undefined,
+  warehouseId: undefined,
+  locationId: undefined,
+  areaId: undefined,
+  quantity: undefined,
+  status: undefined,
+  remark: undefined
+})
+const formRules = reactive({
+  itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
+  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }],
+  locationId: [{ required: true, message: '库区不能为空', trigger: 'change' }],
+  areaId: [{ required: true, message: '库位不能为空', trigger: 'change' }],
+  quantity: [{ required: true, message: '在库数量不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
+})
+const formRef = ref()
+
+/** 打开表单弹窗 */
+const openForm = async (type: string, id?: number) => {
   dialogVisible.value = true
-  dialogTitle.value = '添加盘点任务行'
-  dialogFormType.value = 'create'
+  dialogTitle.value = t('action.' + type)
+  dialogFormType.value = type
   resetForm()
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await StockTakingTaskLineApi.getStockTakingTaskLine(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
 }
 
-const handleEdit = async (row: StockTakingTaskLineVO) => {
-  dialogVisible.value = true
-  dialogTitle.value = '编辑盘点任务行'
-  dialogFormType.value = 'update'
-  formData.value = { ...row }
-}
-
+/** 提交表单 */
 const submitForm = async () => {
   await formRef.value.validate()
   formLoading.value = true
   try {
-    const data = { ...formData.value, taskId: props.taskId }
+    const data = {
+      ...formData.value,
+      taskId: props.taskId
+    } as unknown as StockTakingTaskLineVO
     if (dialogFormType.value === 'create') {
       await StockTakingTaskLineApi.createStockTakingTaskLine(data)
       message.success(t('common.createSuccess'))
@@ -223,6 +247,18 @@ const submitForm = async () => {
   }
 }
 
+/** 仓库变化时清空库区和库位 */
+const handleWarehouseChange = () => {
+  formData.value.locationId = undefined
+  formData.value.areaId = undefined
+}
+
+/** 库区变化时清空库位 */
+const handleLocationChange = () => {
+  formData.value.areaId = undefined
+}
+
+/** 重置表单 */
 const resetForm = () => {
   formData.value = {
     id: undefined,
@@ -238,15 +274,7 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
-const handleDelete = async (id: number) => {
-  try {
-    await message.delConfirm()
-    await StockTakingTaskLineApi.deleteStockTakingTaskLine(id)
-    message.success(t('common.delSuccess'))
-    await getList()
-  } catch {}
-}
-
+/** 监听 taskId 变化 */
 watch(
   () => props.taskId,
   () => {
diff --git a/src/views/mes/wm/stocktaking/task/index.vue b/src/views/mes/wm/stocktaking/task/index.vue
index 27ec664e0..9875406ce 100644
--- a/src/views/mes/wm/stocktaking/task/index.vue
+++ b/src/views/mes/wm/stocktaking/task/index.vue
@@ -142,10 +142,7 @@
             删除
           </el-button>
           <el-button
-            v-if="
-              scope.row.status !== MesWmStockTakingTaskStatusEnum.FINISHED &&
-              scope.row.status !== MesWmStockTakingTaskStatusEnum.CANCELED
-            "
+            v-if="scope.row.status === MesWmStockTakingTaskStatusEnum.APPROVING"
             link
             type="danger"
             @click="handleCancel(scope.row.id)"
@@ -178,7 +175,6 @@ defineOptions({ name: 'MesWmStockTakingTaking' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const router = useRouter() // 路由
 
 const loading = ref(true) // 列表的加载中
 const list = ref<StockTakingTaskVO[]>([]) // 列表数据
@@ -229,7 +225,7 @@ const openForm = (type: string, id?: number) => {
 const handleSubmit = async (id: number) => {
   try {
     await message.confirm('确认提交该盘点任务进行审批？')
-    await StockTakingApi.submitStockTaking({ id })
+    await StockTakingApi.submitStockTaking(id)
     message.success('提交成功')
     await getList()
   } catch {}
@@ -239,7 +235,7 @@ const handleSubmit = async (id: number) => {
 const handleCancel = async (id: number) => {
   try {
     await message.confirm('确认取消该盘点任务？')
-    await StockTakingApi.cancelStockTaking({ id })
+    await StockTakingApi.cancelStockTaking(id)
     message.success('取消成功')
     await getList()
   } catch {}