0521

src/api/business/outsourcedOrderDetail.js

@@ -17,6 +17,14 @@ export function listDetailForReceipt(query) {
 		params: query
 	})
 }
+
+export function getNotFinishedOutsourceDetailList(query) {
+	return request({
+		url: baseUrl + '/business/outsourceDetail/getNotFinishedOutsourceDetailList',
+		method: 'get',
+		params: query
+	})
+}
 // 获取所有的外协单从表
 export function listDetailForAllReceipt(query) {
 	return request({

src/views/business/outsource/form.vue

@@ -224,7 +224,7 @@
               prop="productDescription"
               width="320"
             />
-            <el-table-column label="产品数" align="center" prop="productNum">
+            <el-table-column label="产品数" align="center" width="160" prop="productNum">
               <template #default="scope">
                 <el-input-number
                   v-if="editStatus"

src/views/business/returnReceiptDetail/DialogOutsourceDetails.vue

@@ -117,7 +117,7 @@
 	</el-dialog>
 </template>
 <script setup>
-import { listDetailForReceipt,listDetailForAllReceipt } from '@/api/business/outsourcedOrderDetail'
+import { listDetailForReceipt,getNotFinishedOutsourceDetailList } from '@/api/business/outsourcedOrderDetail'
 const { proxy } = getCurrentInstance()
 const total = ref(0)
 const props = defineProps({
@@ -145,30 +145,9 @@ const selections = ref([])
  */
 function open(data) {
 	visible.value = true
-	showAll.value = false
-	queryParams.value.existingOutsourceDetailIds = data.outsourceDetailIds
 	getList()
 }
 
-//查看对应外协所有批次
-function handleShowAllDetail() {
-	showAll.value = true
-	getAllList()
-}
-//查看对应外协已完成批次
-function handleShowFinishedDetail() {
-	showAll.value = false
-	getList()
-}
-function getAllList() {
-	loading.value = true
-	listDetailForAllReceipt(queryParams.value).then((res) => {
-		dataList.value = res.rows
-		total.value = res.total
-		loading.value = false
-	})
-}
-
 /**
  * 对话框关闭 事件
  */
@@ -184,7 +163,7 @@ function close() {
  */
 function getList() {
 	loading.value = true
-	listDetailForReceipt(queryParams.value).then((res) => {
+	getNotFinishedOutsourceDetailList(queryParams.value).then((res) => {
 		dataList.value = res.rows
 		total.value = res.total
 		loading.value = false

src/views/business/returnTurnover/index.vue

@@ -81,7 +81,6 @@
 					<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="64">
 						<template #default="scope">
 							<el-button v-if="scope.row.flag" link type="warning" icon="Edit" @click="handleShowTurnoverDialog(scope.row)"> 编辑 </el-button>
-							<el-button v-else link type="primary" icon="View" @click="handleShowTurnoverDialog(scope.row)"> 查看 </el-button>
 						</template>
 					</el-table-column>
 				</el-table>