提交

src/components/Pagination/index.vue

@@ -1,16 +1,8 @@
 <template>
   <div :class="{ 'hidden': hidden }" class="pagination-container">
-    <el-pagination
-      :background="background"
-      v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
-      :layout="layout"
-      :page-sizes="pageSizes"
-      :pager-count="pagerCount"
-      :total="total"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+    <el-pagination :background="background" v-model:current-page="currentPage" v-model:page-size="pageSize"
+      :layout="layout" :page-sizes="pageSizes" :pager-count="pagerCount" :total="total" @size-change="handleSizeChange"
+      @current-change="handleCurrentChange" />
   </div>
 </template>
 
@@ -33,7 +25,7 @@ const props = defineProps({
   pageSizes: {
     type: Array,
     default() {
-      return [10, 20, 30, 50]
+      return [10, 50, 100, 300]
     }
   },
   // 移动端页码按钮的数量端默认值5
@@ -72,7 +64,7 @@ const pageSize = computed({
   get() {
     return props.limit
   },
-  set(val){
+  set(val) {
     emit('update:limit', val)
   }
 })

src/store/modules/query.js

@@ -8,7 +8,8 @@ const queryStore = defineStore('query', {
     rejectReportParams: null,
     sortRejectParams: null,
     rejectCategoryParams: null,
-    rejectDetailParams: null
+    rejectDetailParams: null,
+    electronicDrawingParams: null
   }),
   actions: {
     setSearchPositionParams(value) {
@@ -33,12 +34,17 @@ const queryStore = defineStore('query', {
       this.rejectCategoryParams = value
     },
     setRejectDetailParams(value) {
-      console.log(value)
+      // console.log(value)
       this.rejectDetailParams = value
     },
+    setElectronicDrawingParams(value) {
+      this.electronicDrawingParams = value
+    },
     cleanRejectDetailParams() {
-      this.rejectDetailParams.code = ''
-      this.rejectDetailParams.isAbandoned = null
+      if (this.rejectDetailParams != null) {
+        this.rejectDetailParams.code = ''
+        this.rejectDetailParams.isAbandoned = null
+      }
     },
     setRejectDetailParamsName(name) {
       console.log(this.rejectCategoryParams)
@@ -69,6 +75,9 @@ const queryStore = defineStore('query', {
         this.rejectDetailParams = null
         this.rejectCategoryParams = null
       }
+      if (obj.name == 'ElectronicDrawings') {
+        this.electronicDrawingParams = null
+      }
     },
     allClean() {
       this.searchPositionParams = null
@@ -79,6 +88,7 @@ const queryStore = defineStore('query', {
       this.sortRejectParams = null
       this.rejectDetailParams = null
       this.rejectCategoryParams = null
+      this.electronicDrawingParams = null
     },
     otherClean(obj) {
       if (obj.name == 'SearchPosition') {
@@ -89,6 +99,7 @@ const queryStore = defineStore('query', {
         this.sortRejectParams = null
         this.rejectDetailParams = null
         this.rejectCategoryParams = null
+        this.electronicDrawingParams = null
 
       } else if (obj.name == 'ReviseBath') {
         this.searchPositionParams = null
@@ -98,6 +109,7 @@ const queryStore = defineStore('query', {
         this.sortRejectParams = null
         this.rejectDetailParams = null
         this.rejectCategoryParams = null
+        this.electronicDrawingParams = null
       }
       else if (obj.name == 'ReportPlan') {
         this.searchPositionParams = null
@@ -107,6 +119,7 @@ const queryStore = defineStore('query', {
         this.sortRejectParams = null
         this.rejectDetailParams = null
         this.rejectCategoryParams = null
+        this.electronicDrawingParams = null
       }
       else if (obj.name == 'Report') {
         this.searchPositionParams = null
@@ -116,6 +129,7 @@ const queryStore = defineStore('query', {
         this.sortRejectParams = null
         this.rejectDetailParams = null
         this.rejectCategoryParams = null
+        this.electronicDrawingParams = null
       }
       else if (obj.name == 'RejectReport') {
         this.searchPositionParams = null
@@ -125,6 +139,7 @@ const queryStore = defineStore('query', {
         this.sortRejectParams = null
         this.rejectDetailParams = null
         this.rejectCategoryParams = null
+        this.electronicDrawingParams = null
       }
       else if (obj.name == 'SortReject') {
         this.searchPositionParams = null
@@ -134,6 +149,7 @@ const queryStore = defineStore('query', {
         this.rejectReportParams = null
         this.rejectDetailParams = null
         this.rejectCategoryParams = null
+        this.electronicDrawingParams = null
       }
       else if (obj.name == 'Reject') {
         this.searchPositionParams = null
@@ -142,6 +158,16 @@ const queryStore = defineStore('query', {
         this.reportParams = null
         this.rejectReportParams = null
         this.sortRejectParams = null
+        this.electronicDrawingParams = null
+      } else if (obj.name == 'ElectronicDrawings') {
+        this.searchPositionParams = null
+        this.reviseBathParams = null
+        this.reportPlanParams = null
+        this.reportParams = null
+        this.rejectReportParams = null
+        this.sortRejectParams = null
+        this.rejectDetailParams = null
+        this.rejectCategoryParams = null
       } else {
         this.searchPositionParams = null
         this.reviseBathParams = null
@@ -151,6 +177,7 @@ const queryStore = defineStore('query', {
         this.sortRejectParams = null
         this.rejectDetailParams = null
         this.rejectCategoryParams = null
+        this.electronicDrawingParams = null
       }
     }
   }

src/views/business/electronicDrawings/index.vue

@@ -4,30 +4,30 @@
 			<el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
 				<el-form-item class="section-title" label="图纸管理" />
 				<el-form-item label="产品类别：">
-					<el-select v-model="queryParams.type" clearable placeholder="请选择类别"  style="width: 150px">
+					<el-select v-model="queryParams.type" clearable placeholder="请选择类别" style="width: 150px">
 						<el-option v-for="dict in product_type" :key="dict.value" :label="dict.label"
 							:value="dict.value"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="客户集团简称：">
 					<el-input placeholder="请输入客户集团简称" v-model.trim="queryParams.companyAlias" clearable
-						@keyup.enter="handleQueryProduct" @keydown.enter.prevent style="width: 150px"  />
+						@keyup.enter="handleQueryProduct" @keydown.enter.prevent style="width: 150px" />
 				</el-form-item>
 				<el-form-item label="图号：">
 					<el-input placeholder="请输入产品图号" v-model.trim="queryParams.drawingNumber" clearable
-						@keyup.enter="handleQueryProduct" @keydown.enter.prevent  style="width: 150px"/>
+						@keyup.enter="handleQueryProduct" @keydown.enter.prevent style="width: 150px" />
 				</el-form-item>
 				<el-form-item label="规格：">
 					<el-input placeholder="请输入产品规格" v-model.trim="queryParams.specification" clearable
-						@keyup.enter="handleQueryProduct" @keydown.enter.prevent  style="width: 150px"/>
+						@keyup.enter="handleQueryProduct" @keydown.enter.prevent style="width: 150px" />
 				</el-form-item>
 				<el-form-item label="料号：">
 					<el-input placeholder="请输入产品料号" v-model.trim="queryParams.productCode" clearable
-						@keyup.enter="handleQueryProduct" @keydown.enter.prevent  style="width: 150px"/>
+						@keyup.enter="handleQueryProduct" @keydown.enter.prevent style="width: 150px" />
 				</el-form-item>
 				<el-form-item label="产品描述：">
 					<el-input placeholder="请输入产品描述" v-model.trim="queryParams.description" clearable
-						@keyup.enter="handleQueryProduct" @keydown.enter.prevent  style="width: 150px"/>
+						@keyup.enter="handleQueryProduct" @keydown.enter.prevent style="width: 150px" />
 				</el-form-item>
 				<el-form-item>
 					<el-button type="info" icon="Search" @click="handleQueryProduct">搜索</el-button>
@@ -36,8 +36,8 @@
 			<!-- 列表区 -->
 			<div class="el-table-container">
 				<div class="el-table-inner-container">
-					<el-table ref="productTable" v-loading="productLoading" :data="productList" row-key="id"
-						highlight-current-row height="100%">
+					<el-table ref="productTable" v-loading="productLoading" :data="productList" row-key="id" highlight-current-row
+						height="100%">
 						<el-table-column type="index" label="行号" width="50" align="center" />
 						<el-table-column label="料号" align="center" prop="productCode" />
 						<el-table-column label="预入仓库" align="center" prop="preStock" />
@@ -101,8 +101,8 @@
 					<el-form-item>
 						<el-select-v2 v-model="currentTechnological.id" clearable :options="technologicalProcessList"
 							placeholder="请选择版本" @change="handelTechnological" style="width: 220px" />
-						<el-button :disabled="!currentTechnological.id" type="primary" icon="Search" v-hasPermi="['business:electronicDrawings:query']"
-							style="margin-left: 10px;" @click="handelDrawing">查看全部
+						<el-button :disabled="!currentTechnological.id" type="primary" icon="Search"
+							v-hasPermi="['business:electronicDrawings:query']" style="margin-left: 10px;" @click="handelDrawing">查看全部
 						</el-button>
 					</el-form-item>
 				</el-form>
@@ -110,15 +110,15 @@
 			<div class="el-table-inner-container" style="padding-bottom: 30px;">
 				<el-table :data="technologicalprocessDetailList" v-loading="technologicalprocessDetailLoading"
 					:row-key="getRowKey" highlight-current-row height="100%">
-					<el-table-column label="工序步骤编号"  width="100px"  align="center" prop="processStepNumber">
+					<el-table-column label="工序步骤编号" width="100px" align="center" prop="processStepNumber">
 						<template #default="scope">
 
 							<div>{{ scope.row.processStepNumber }}</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="工序编码"  width="80px" align="center" prop="processCode" />
+					<el-table-column label="工序编码" width="80px" align="center" prop="processCode" />
 					<el-table-column label="工序简称" align="center" prop="processAlias" />
-					<el-table-column label="图纸个数" align="center" width="60px" prop="drawingNum"/>
+					<el-table-column label="图纸个数" align="center" width="60px" prop="drawingNum" />
 					<el-table-column label="操作" width="80px" align="center">
 						<template #default="scope">
 							<el-button link type="primary" v-hasPermi="['business:electronicDrawings:query']"
@@ -134,6 +134,7 @@
 <script setup name="Process">
 import { listProduct, getTechnological } from '@/api/business/product'
 import { listTechnologicalProcessDetail } from '@/api/business/technologicalProcessDetail'
+import queryStore from "@/store/modules/query";
 import router from "@/router";
 
 const { proxy } = getCurrentInstance()
@@ -187,6 +188,8 @@ function getList() {
 /**产品查询 */
 function handleQueryProduct() {
 	queryParams.value.pageNum = 1
+	const listQueryParams = JSON.parse(JSON.stringify(queryParams.value));
+	queryStore().setElectronicDrawingParams(listQueryParams);
 	getList()
 }
 function handleProduct(row) {
@@ -197,11 +200,12 @@ function handleProduct(row) {
 	currentProduct.value = row
 	var technological = {}
 	technological.productId = row.id
+
 	getTechnological(technological).then(res => {
 		if (res.code == 200) {
 			technologicalProcessList.value = res.data
-			
-			if(technologicalProcessList.value.length>0){
+
+			if (technologicalProcessList.value.length > 0) {
 				currentProduct.value.technologicalprocessId = technologicalProcessList.value[0].value
 				currentProduct.value.productVersion = technologicalProcessList.value[0].label
 				currentTechnological.value.id = technologicalProcessList.value[0].value
@@ -216,7 +220,7 @@ function handleProduct(row) {
 function handelTechnological() {
 	if (currentTechnological.value.id) {
 		currentProduct.value.technologicalprocessId = currentTechnological.value.id
-		currentProduct.value.productVersion =  technologicalProcessList.value.find(item => item.value === currentTechnological.value.id).label;
+		currentProduct.value.productVersion = technologicalProcessList.value.find(item => item.value === currentTechnological.value.id).label;
 		handelDetails()
 	}
 }
@@ -224,7 +228,7 @@ function handelTechnological() {
 function handelDetails() {
 	technologicalprocessDetailLoading.value = true
 	listTechnologicalProcessDetail({
-		isHistory:0,
+		isHistory: 0,
 		technologicalProcessId: currentTechnological.value.id
 	}).then((res) => {
 		technologicalprocessDetailList.value = res.rows
@@ -233,17 +237,19 @@ function handelDetails() {
 }
 
 function handelDrawing(row) {
-	console.log(currentProduct.value,1123)
-	if(row){
+	console.log(currentProduct.value, 1123)
+	if (row) {
 		currentProduct.value.processCode = row.processCode
 		router.push({
-  path: `/drawing/drawingDetail/${currentProduct.value.id}/${currentProduct.value.productVersion}/${row.processCode}`});
+			path: `/drawing/drawingDetail/${currentProduct.value.id}/${currentProduct.value.productVersion}/${row.processCode}`
+		});
 
-	}else{
-		console.log(currentProduct.value,1123)
-		currentProduct.value.processCode =null
+	} else {
+		console.log(currentProduct.value, 1123)
+		currentProduct.value.processCode = null
 		router.push({
-  path: `/drawing/drawingDetail/${currentProduct.value.id}/${currentProduct.value.productVersion}`});
+			path: `/drawing/drawingDetail/${currentProduct.value.id}/${currentProduct.value.productVersion}`
+		});
 	}
 
 
@@ -258,6 +264,10 @@ function getRowKey(row) {
 	return row.id
 }
 onMounted(() => {
+	const listQueryParams = queryStore().electronicDrawingParams;
+	if (listQueryParams != null) {
+		queryParams.value = listQueryParams;
+	}
 	getList()
 })
 </script>

src/views/business/reject/index.vue

@@ -6,7 +6,8 @@
       <el-form class="list-search-container" ref="queryRef" :inline="true" style="display: flex">
         <el-form-item class="section-title" label="载具类别" />
         <el-form-item label="类别名称：">
-          <el-input placeholder="请输入类别名称" clearable style="width: 150px" v-model.trim="name" @keydown.enter.prevent />
+          <el-input placeholder="请输入类别名称" clearable style="width: 150px" v-model="name" @keydown.enter.prevent
+            @blur="trimBlur('name')" />
         </el-form-item>
       </el-form>
       <!-- 列表区 -->
@@ -34,7 +35,8 @@
         <el-form-item class="section-title" label="载具操作明细" />
         <el-form-item label="载具编号：">
           <el-input placeholder="请输入载具编号" :disabled="carrierCategoryList.length == 0" clearable style="width: 180px"
-            v-model.trim="queryCarrierRejectParams.code" @keydown.enter.prevent @keyup.enter="handleQueryCarrier" />
+            v-model="queryCarrierRejectParams.code" @blur="trimBlur('code')" @keydown.enter.prevent
+            @keyup.enter="handleQueryCarrier" />
         </el-form-item>
         <el-form-item label="载具状态：">
           <el-select v-model="queryCarrierRejectParams.isAbandoned" clearable placeholder="请选择载具状态"
@@ -244,6 +246,7 @@ const getCarriersReject = () => {
 // 载具操作明细搜索
 const handleQueryCarrier = () => {
   queryCarrierRejectParams.value.pageNum = 1;
+  queryCarrierRejectParams.value.code = queryCarrierRejectParams.value.code.trim()
   const listQueryParams = JSON.parse(JSON.stringify(queryCarrierRejectParams.value));
   listQueryParams.name = name.value
   queryStore().setRejectDetailParams(listQueryParams);
@@ -253,7 +256,13 @@ const handleQueryCarrier = () => {
 const setQueryName = () => {
   queryStore().setRejectDetailParamsName(name.value);
   // console.log(queryStore().rejectDetailParams)
-
+}
+const trimBlur = (param) => {
+  if (param == 'name') {
+    name.value = name.value.trim()
+  } else {
+    queryCarrierRejectParams.value[param] = queryCarrierRejectParams.value[param].trim()
+  }
 }
 onMounted(() => {
   // console.log(queryStore().rejectDetailParams)

src/views/business/rejectReport/index.vue

@@ -10,18 +10,18 @@
                         style="width: 130px" @change="handleDeptChange" />
                 </el-form-item>
                 <el-form-item label="批次号：">
-                    <el-input placeholder="请输入批次号" v-model.trim="queryParams.lotCode" @keydown.enter.prevent clearable
-                        style="width: 140px" />
+                    <el-input placeholder="请输入批次号" v-model="queryParams.lotCode" @blur="trimBlur('lotCode')"
+                        @keydown.enter.prevent clearable style="width: 140px" />
                 </el-form-item>
                 <el-form-item label="产品描述：">
-                    <el-input placeholder="请输入产品描述" v-model.trim="queryParams.productDescription" @keydown.enter.prevent
-                        clearable style="width: 130px" />
+                    <el-input placeholder="请输入产品描述" v-model="queryParams.productDescription"
+                        @blur="trimBlur('productDescription')" @keydown.enter.prevent clearable style="width: 130px" />
                 </el-form-item>
 
                 <el-form-item label="废品提交时间：">
                     <el-date-picker v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD"
                         :editable="false" clearable placeholder="请选择" style="width: 136px" @change="handleTimeChange" />
-                    <span>~</span>
+                    <span>到</span>
                     <el-date-picker v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD"
                         :editable="false" clearable placeholder="请选择" style="width: 136px" @change="handleTimeChange" />
                 </el-form-item>
@@ -174,6 +174,10 @@ function getTotalRejct() {
     return sum
 }
 
+function trimBlur(param) {
+    queryParams.value[param] = queryParams.value[param].trim()
+}
+
 onMounted(() => {
     getList();
 });

src/views/business/sortReject/index.vue

@@ -7,17 +7,17 @@
                 style="margin-right: 0px">
                 <el-form-item class="section-title" label="分选废品报表" />
                 <el-form-item label="批次号：">
-                    <el-input placeholder="请输入批次号" v-model.trim="queryParams.lotCode" @keydown.enter.prevent clearable
-                        style="width: 130px" />
+                    <el-input placeholder="请输入批次号" v-model.trim="queryParams.lotCode" @blur="trimBlur('lotCode')"
+                        @keydown.enter.prevent clearable style="width: 130px" />
                 </el-form-item>
                 <el-form-item label="产品描述：">
-                    <el-input placeholder="请输入产品描述" v-model.trim="queryParams.productDescription" @keydown.enter.prevent
-                        clearable style="width: 130px" />
+                    <el-input placeholder="请输入产品描述" v-model.trim="queryParams.productDescription"
+                        @blur="trimBlur('productDescription')" @keydown.enter.prevent clearable style="width: 130px" />
                 </el-form-item>
                 <el-form-item label="时间：">
                     <el-date-picker v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD"
                         :editable="false" clearable placeholder="请选择" style="width: 136px" />
-                    <span>~</span>
+                    <span>到</span>
                     <el-date-picker v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD"
                         :editable="false" clearable placeholder="请选择" style="width: 136px" />
                 </el-form-item>
@@ -168,6 +168,10 @@ function handleQuery() {
     getSortCheckStandardList()
 }
 
+function trimBlur(param) {
+    queryParams.value[param] = queryParams.value[param].trim()
+}
+
 onMounted(() => {
     getList();
 });