From 4d0c0ae91adb2210cc085cb65d6fb9980ce4ec1f Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 3 Aug 2023 15:09:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=9F=BA=E7=A1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/qualityInspectionDet/index.vue       | 45 ++++++++++++-------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue
index da2a30d7..939568c5 100644
--- a/src/views/quality/base/qualityInspectionDet/index.vue
+++ b/src/views/quality/base/qualityInspectionDet/index.vue
@@ -17,6 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
+				fixed="right"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -49,6 +50,9 @@
 							prop: 'typeId',
 							url: '/base/quality-inspection-type/listAll',
 							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+							bind: {
+								filterable: true,
+							},
 						},
 					],
 					[
@@ -59,7 +63,14 @@
 							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
 						},
 					],
-					[{ input: true, label: '检测编码', prop: 'code' }],
+					[
+						{
+							input: true,
+							label: '内容编码',
+							prop: 'code',
+							url: '/base/quality-inspection-det/getCode',
+						},
+					],
 					[{ input: true, label: '备注', prop: 'remark' }],
 				]" />
 		</base-dialog>
@@ -93,20 +104,20 @@ export default {
 					placeholder: '请输入检测内容',
 					param: 'content',
 				},
-				{
-					type: 'datePicker',
-					label: '创建时间',
-					dateType: 'daterange', // datetimerange
-					// format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'createTime',
-					width: 350,
-				},
+				// {
+				// 	type: 'datePicker',
+				// 	label: '创建时间',
+				// 	dateType: 'daterange', // datetimerange
+				// 	// format: 'yyyy-MM-dd HH:mm:ss',
+				// 	format: 'yyyy-MM-dd',
+				// 	valueFormat: 'yyyy-MM-dd HH:mm:ss',
+				// 	rangeSeparator: '-',
+				// 	startPlaceholder: '开始日期',
+				// 	endPlaceholder: '结束日期',
+				// 	defaultTime: ['00:00:00', '23:59:59'],
+				// 	param: 'createTime',
+				// 	width: 350,
+				// },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -161,8 +172,8 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'typeId', label: '检测类型ID', align: 'center' },
-				{ prop: 'content', label: '检测类型内容', align: 'center' },
+				{ prop: 'typeName', label: '类型名称', align: 'center' },
+				{ prop: 'content', label: '检测内容', align: 'center' },
 				{ prop: 'code', label: '检测编码', align: 'center' },
 				{ prop: 'remark', label: '备注', align: 'center' },
 			],