Merge remote-tracking branch 'origin/master'

src/views/business/returnReceipt/DialogOutsourceDetails.vue

@@ -1,78 +1,39 @@
 <template>
-	<el-dialog
-		title="添加收回明细"
-		v-model="visible"
-		width="800px"
-		height="400px"
-		@close="close"
-		append-to-body
-		draggable
-	>
+	<el-dialog title="添加收回明细" v-model="visible" width="800px" height="400px" @close="close" append-to-body draggable>
 		<el-form ref="dialogForm" :model="queryParams" :inline="true" style="padding-top: 16px">
 			<el-form-item label="批次号：" prop="lotCode" label-width="70">
-				<el-input
-					v-model.trim="queryParams.lotCode"
-					type="text"
-					@keydown.enter.prevent
-					style="width: 160px"
-					placeholder="请输入批次号"
-					:clearable="true"
-					@keyup.enter="handleSearch"
-				/>
+				<el-input v-model.trim="queryParams.lotCode" type="text" @keydown.enter.prevent style="width: 160px"
+					placeholder="请输入批次号" :clearable="true" @keyup.enter="handleSearch" />
 			</el-form-item>
 			<el-form-item label="产品描述：" prop="productDescription" label-width="90">
-				<el-input
-					v-model.trim="queryParams.productDescription"
-					type="text"
-					@keydown.enter.prevent
-					style="width: 160px"
-					placeholder="请输入关键字"
-					:clearable="true"
-					@keyup.enter="handleSearch"
-				/>
+				<el-input v-model.trim="queryParams.productDescription" type="text" @keydown.enter.prevent style="width: 160px"
+					placeholder="请输入关键字" :clearable="true" @keyup.enter="handleSearch" />
 			</el-form-item>
 			<el-form-item label-width="20px">
 				<el-button type="info" icon="Search" @click="handleSearch">搜索</el-button>
 			</el-form-item>
 			<div style="float: inline-end">
-          <span
-		    v-if="!showAll"
-            style="
+				<span v-if="!showAll" style="
               color: rgba(0, 203, 117, 1);
               font-size: 16px;
               font-weight: 400;
               line-height: 40px;
               cursor: pointer;
               display: inline-block;
-            "
-            @click="handleShowAllDetail"
-            >+查看所有明细</span
-          >
-		  <span
-		  v-else
-            style="
+            " @click="handleShowAllDetail">+查看所有明细</span>
+				<span v-else style="
               color: rgba(0, 203, 117, 1);
               font-size: 16px;
               font-weight: 400;
               line-height: 40px;
               cursor: pointer;
               display: inline-block;
-            "
-            @click="handleShowFinishedDetail"
-            >+查看已完成明细</span
-          >
-        </div>
+            " @click="handleShowFinishedDetail">+查看已完成明细</span>
+			</div>
 		</el-form>
 
-		<el-table
-			ref="dialogTable"
-			:data="dataList"
-			size="small"
-			v-loading="loading"
-			border
-			height="370px"
-			@selection-change="handleSelectionChange"
-		>
+		<el-table ref="dialogTable" :data="dataList" size="small" v-loading="loading" border height="370px"
+			@selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="40" align="center" />
 			<el-table-column type="index" label="行号" width="50" align="center" />
 			<el-table-column label="批次号" align="center" prop="lotCode" width="96" />
@@ -80,20 +41,15 @@
 			<el-table-column label="产品描述" align="center" prop="productDescription" />
 			<el-table-column label="箱号" align="center" prop="originalCarrier" width="220">
 				<template #default="scope">
-        <!-- 检查 scope.row.newCarrier 是否有值 -->
-        <span v-if="scope.row.newCarrier">{{ scope.row.newCarrier }}</span>
-        <span v-else>{{ scope.row.originalCarrier }}</span>
-      </template>
+					<!-- 检查 scope.row.newCarrier 是否有值 -->
+					<span v-if="scope.row.newCarrier">{{ scope.row.newCarrier }}</span>
+					<span v-else>{{ scope.row.originalCarrier }}</span>
+				</template>
 			</el-table-column>
 		</el-table>
 		<!-- 分页 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			v-model:page="queryParams.pageNum"
-			v-model:limit="queryParams.pageSize"
-			@pagination="handleChangePageSize"
-		/>
+		<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+			v-model:limit="queryParams.pageSize" @pagination="handleChangePageSize" />
 		<template #footer>
 			<div class="dialog-footer">
 				<el-button type="primary" icon="Check" :disabled="selections.length === 0" @click="handleMultipleSelected">
@@ -105,7 +61,7 @@
 	</el-dialog>
 </template>
 <script setup>
-import { listDetailForReceipt,listDetailForAllReceipt } from '@/api/business/outsourcedOrderDetail'
+import { listDetailForReceipt, listDetailForAllReceipt } from '@/api/business/outsourcedOrderDetail'
 const { proxy } = getCurrentInstance()
 const total = ref(0)
 const props = defineProps({
@@ -160,10 +116,10 @@ function getAllList() {
 	})
 }
 function handleChangePageSize() {
-	if(showAll.value) {
+	if (showAll.value) {
 		console.log("1")
 		getAllList()
-	}else {
+	} else {
 		console.log("2")
 		getList()
 	}
@@ -200,10 +156,10 @@ function handleSelectionChange(selection) {
 
 /**  搜索 事件 */
 function handleSearch() {
-	if(showAll) {
+	if (showAll.value) {
 		getAllList()
-	}else {
-	getList()
+	} else {
+		getList()
 	}
 }
 /** 多选事件 */