0514

src/views/business/outsourcedOrderDetails/index.vue

@@ -63,7 +63,7 @@
 					<el-table-column label="产品描述" align="center" prop="productDescription" />
 					<el-table-column label="产品数量" align="center" prop="productNum" width="80" />
 					<el-table-column label="工序名称" align="center" prop="processAlias" width="80" />
-					<el-table-column label="工序序号" align="center" prop="processStepNumber" width="80" />
+					<!-- <el-table-column label="工序序号" align="center" prop="processStepNumber" width="80" /> -->
 					<el-table-column label="投产数" align="center" prop="productionNum" width="120">
 						<template #default="scope">
 							<el-input-number
@@ -248,7 +248,7 @@ const spanPropGroup = (data) => {
  
 const rowSpanMethod =({ row, column, rowIndex, columnIndex }) => {
   //采样值5-9列所对应的行不需要合并
-  if (columnIndex != 5 && columnIndex != 6 && columnIndex != 7 && columnIndex != 8 && columnIndex != 9 && columnIndex != 10) {
+  if (columnIndex != 5 && columnIndex != 6 && columnIndex != 7 && columnIndex != 8 && columnIndex != 9 ) {
     //根据当前行号从map中获取开始合并的行根据当前行号从map中获取开始合并的行号，向下合并多少行
     const span = rowSpansMap.get(rowIndex);
     if (span != null) {

src/views/business/returnReceipt/index.vue

@@ -11,9 +11,9 @@
 					@keyup.enter="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="表单日期：" prop="formDate">
+			<el-form-item label="表单日期：" >
 				<el-date-picker
-					v-model="queryParams.formStartDate"
+					v-model="queryParams.startTime"
 					type="date"
 					style="width: 144px"
 					value-format="YYYY-MM-DD"
@@ -22,7 +22,7 @@
 				/>
 				<span style="margin: 0 4px">~</span>
 				<el-date-picker
-					v-model="queryParams.formEndDate"
+					v-model="queryParams.endTime"
 					type="date"
 					style="width: 144px"
 					value-format="YYYY-MM-DD"
@@ -39,7 +39,7 @@
 		<!-- 功能按钮区 -->
 		<div class="list-btns-container">
 			<el-button type="primary" icon="Plus" @click="handleShowFormDialog(null)"> 新增 </el-button>
-			<el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete"> 删除 </el-button>
+			<el-button type="danger" icon="Delete" :disabled="ids.length == 0" @click="handleDelete"> 删除 </el-button>
 		</div>
 		<!-- 渲染数据区 -->
 		<div class="el-table-container">
@@ -92,7 +92,9 @@ const queryParams = ref({
 	pageNum: 1,
 	pageSize: 10,
 	formCode: null,
-	formDate: null
+	formDate: null,
+	startTime:null,
+	endTime:null
 })
 
 /***********************  方法区  ****************************/
@@ -116,7 +118,14 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
-	proxy.resetForm('queryRef')
+	queryParams.value= ref({
+	pageNum: 1,
+	pageSize: 10,
+	formCode: null,
+	formDate: null,
+	startTime:null,
+	endTime:null
+})
 	handleQuery()
 }
 /**复选框选中数据 */