0521

src/views/business/returnReceiptDetail/form.vue

@@ -58,12 +58,12 @@
 						<el-table-column label="收回数量" align="center" prop="receiptNum" width="104"/>
 						<el-table-column label="备注" align="center" prop="remark">
 							<template #default="scope">
-								<el-input v-model="scope.row.remark" v-if="editStatus" />
-								<el-input v-model="scope.row.remark" v-else readonly />
-							</template>
+								<el-input v-model="scope.row.remark" v-if="detailInfo.returnReceiptDetailList && detailInfo.returnReceiptDetailList.length > 0 && detailInfo.returnReceiptDetailList[0].auditNum > 0" readonly/>
+									<el-input v-model="scope.row.remark" v-else />
+								</template>
 						</el-table-column>
 						<el-table-column label="操作" align="center" width="104">
-							<el-button :disabled="!editStatus"  type="primary" :loading="isSubmitting" icon="Bell" @click="handleAddReceiptDetail()">收回</el-button>
+							<el-button :disabled="detailInfo.returnReceiptDetailList && detailInfo.returnReceiptDetailList.length > 0 && detailInfo.returnReceiptDetailList[0].auditNum > 0"  type="primary" :loading="isSubmitting" icon="Bell" @click="handleAddReceiptDetail()">收回</el-button>
 					</el-table-column>
 					</el-table>
 				</div>

src/views/business/returnReceiptDetail/index.vue

@@ -179,13 +179,13 @@ function handleDelete() {
 }
 function handleDeleteDetail(row) {
     proxy.$modal
-		.confirm('是否确认删除收回明细？')
+		.confirm('是否取消收回明细？')
 		.then(function () {
 			return delReceiptDetail(row.id)
 		})
 		.then(() => {
 			getList()
-			proxy.$modal.msgSuccess('删除成功！')
+			proxy.$modal.msgSuccess('取消成功！')
 		})
 		.catch(() => {})
 }