From 96b5e6c7ff9a00378f20645cad8ce9b264dd060a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Fri, 27 Dec 2024 14:20:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reportFlow/fqc.js                     |  37 ++
 .../FQC/defectCollection.vue                  |  57 ++-
 .../quality/components/TheWorkOrderList.vue   |  86 ++++
 src/views/touchScreen/quality/index.vue       | 435 ++++++++++++++++--
 src/views/touchScreen/report/index.vue        |   1 -
 5 files changed, 565 insertions(+), 51 deletions(-)
 create mode 100644 src/api/reportFlow/fqc.js
 create mode 100644 src/views/touchScreen/quality/components/TheWorkOrderList.vue

diff --git a/src/api/reportFlow/fqc.js b/src/api/reportFlow/fqc.js
new file mode 100644
index 0000000..ea4acb5
--- /dev/null
+++ b/src/api/reportFlow/fqc.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 获取所有缺陷配置
+export function getDefectConfig(params) {
+  return request({
+    url: '/mes/qualityManagement/FQC/QcDefectConfig/list_no_page',
+    method: 'get',
+    params
+  })
+}
+
+// 增加缺陷数
+export function AddDefectNum(params) {
+  return request({
+    url: '/mes/qualityManagement/FQC/QcFinishedproductDefect/add_defect_num',
+    method: 'get',
+    params
+  })
+}
+
+// 修改缺陷数
+export function UpdateDefectNum(params) {
+  return request({
+    url: '/mes/qualityManagement/FQC/QcFinishedproductDefect/update_defect_num',
+    method: 'get',
+    params
+  })
+}
+
+// 查询指定工单下的缺陷
+export function SearchDefectList(params) {
+  return request({
+    url: '/mes/qualityManagement/FQC/QcFinishedproductDefect/search_defects',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/qualityManagement/FQC/defectCollection.vue b/src/views/qualityManagement/FQC/defectCollection.vue
index e147ebe..822e4c4 100644
--- a/src/views/qualityManagement/FQC/defectCollection.vue
+++ b/src/views/qualityManagement/FQC/defectCollection.vue
@@ -1,8 +1,8 @@
 <template>
     <div>
         <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
-            <el-form-item label="工单号" prop="fkWorkorder">
-                <el-input v-model="queryParams.fkWorkorder" placeholder="请输入工单号" />
+            <el-form-item label="工单号" prop="workorder">
+                <el-input v-model="queryParams.workorder" placeholder="请输入工单号" />
             </el-form-item>
 
             <el-form-item label="组别" prop="groupCode">
@@ -14,7 +14,8 @@
             </el-form-item>
 
             <el-form-item label="筛选日期" prop="timeRange">
-                <el-date-picker v-model="queryParams.timeRange" type="daterange" range-separator="到" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="请选择日期区间" />
+                <el-date-picker v-model="queryParams.timeRange" type="daterange" range-separator="到"
+                    start-placeholder="开始时间" end-placeholder="结束时间" placeholder="请选择日期区间" />
             </el-form-item>
             <el-form-item>
                 <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
@@ -31,11 +32,15 @@
             <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row @sort-change="sortChange">
+        <el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell"
+            highlight-current-row @sort-change="sortChange">
             <el-table-column type="index" width="50" align="center" />
-            <el-table-column prop="fkWorkorder" label="工单号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('fkWorkorder')" />
-            <el-table-column prop="lineCode" label="线别" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('lineCode')" />
-            <el-table-column prop="groupCode" label="组别" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('groupCode')" />
+            <el-table-column prop="workorder" label="工单号" align="center" :show-overflow-tooltip="true"
+                v-if="columns.showColumn('workorder')" />
+            <el-table-column prop="lineCode" label="线别" align="center" :show-overflow-tooltip="true"
+                v-if="columns.showColumn('lineCode')" />
+            <el-table-column prop="groupCode" label="组别" align="center" :show-overflow-tooltip="true"
+                v-if="columns.showColumn('groupCode')" />
             <el-table-column prop="dispatchNum" label="计划数量" align="center" v-if="columns.showColumn('dispatchNum')" />
             <el-table-column prop="finishedNum" label="实际数量" align="center" v-if="columns.showColumn('finishedNum')" />
             <el-table-column label="缺陷描述" width="100" align="center">
@@ -43,15 +48,21 @@
                     <el-button text bg type="success" size="small" @click="showDefectDialog(scope.row)">缺陷查看</el-button>
                 </template>
             </el-table-column>
-            <el-table-column prop="qualifiedNumber" label="合格数" align="center" v-if="columns.showColumn('qualifiedNumber')" />
-            <el-table-column prop="unqualifiedNumber" label="不合格数" align="center" v-if="columns.showColumn('unqualifiedNumber')" />
+            <el-table-column prop="qualifiedNumber" label="合格数" align="center"
+                v-if="columns.showColumn('qualifiedNumber')" />
+            <el-table-column prop="unqualifiedNumber" label="不合格数" align="center"
+                v-if="columns.showColumn('unqualifiedNumber')" />
             <el-table-column prop="reworkNumber" label="返工数" align="center" v-if="columns.showColumn('reworkNumber')" />
             <el-table-column prop="scrapNumber" label="报废数" align="center" v-if="columns.showColumn('scrapNumber')" />
             <el-table-column prop="remark" label="备注" align="center" v-if="columns.showColumn('remark')" />
-            <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
-            <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
-            <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
-            <el-table-column prop="updatedTime" label="更新时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+            <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true"
+                v-if="columns.showColumn('createdBy')" />
+            <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true"
+                v-if="columns.showColumn('createdTime')" />
+            <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true"
+                v-if="columns.showColumn('updatedBy')" />
+            <el-table-column prop="updatedTime" label="更新时间" align="center" :show-overflow-tooltip="true"
+                v-if="columns.showColumn('updatedTime')" />
             <!-- <el-table-column label="操作" width="200" align="center">
 				<template #default="scope">
 					<el-button type="success" size="small" icon="edit" title="编辑" v-hasPermi="['productManagement:proreportwork:edit']" @click="handleUpdate(scope.row)"></el-button>
@@ -59,15 +70,16 @@
 				</template>
 			</el-table-column> -->
         </el-table>
-        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+            @pagination="getList" />
 
         <!-- 添加或修改报工表对话框 -->
         <el-dialog :title="title" :lock-scroll="false" v-model="open">
             <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
                 <el-row :gutter="20">
                     <el-col :lg="24">
-                        <el-form-item label="工单号" prop="fkWorkorder">
-                            <el-input disabled v-model="form.fkWorkorder" placeholder="请输入工单号" />
+                        <el-form-item label="工单号" prop="workorder">
+                            <el-input disabled v-model="form.workorder" placeholder="请输入工单号" />
                         </el-form-item>
                     </el-col>
 
@@ -126,7 +138,8 @@
                 <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
             </template>
         </el-dialog>
-        <ZrDialog width="70%" v-model="handleDefectShow" title="缺陷项" :close-on-click-modal="false" append-to-body draggable>
+        <ZrDialog width="70%" v-model="handleDefectShow" title="缺陷项" :close-on-click-modal="false" append-to-body
+            draggable>
             <el-row :gutter="20">
                 <el-col :span="10">
                     <div class="grid-content ep-bg-purple" />
@@ -144,14 +157,14 @@
 </template>
 
 <script setup name="proreportwork">
-import { listProReportwork, addProReportwork, delProReportwork, updateProReportwork, getProReportwork, GetPersonsList } from '@/api/productManagement/proreportwork.js'
+import { listProReportwork, addProReportwork, delProReportwork, updateProReportwork, getProReportwork } from '@/api/productManagement/proreportwork.js'
 const { proxy } = getCurrentInstance()
 const ids = ref([])
 const loading = ref(false)
 const showSearch = ref(true)
 const queryParams = reactive({
     timeRange: [proxy.dayjs(), proxy.dayjs()],
-    fkWorkorder: '',
+    workorder: '',
     groupCode: '',
     lineCode: '',
     pageNum: 1,
@@ -161,7 +174,7 @@ const queryParams = reactive({
 })
 const columns = ref([
     { visible: false, prop: 'id', label: '雪花' },
-    { visible: true, prop: 'fkWorkorder', label: '工单号' },
+    { visible: true, prop: 'workorder', label: '工单号' },
     { visible: true, prop: 'dispatchNum', label: '计划数量' },
     { visible: true, prop: 'finishedNum', label: '实际数量' },
     { visible: true, prop: 'groupCode', label: '组别' },
@@ -249,7 +262,7 @@ function cancel() {
 function reset() {
     form.value = {
         id: null,
-        fkWorkorder: null,
+        workorder: null,
         dispatchNum: null,
         finishedNum: null,
         groupCode: null,
@@ -354,7 +367,7 @@ function showDefectDialog(row) {
 function getDefectList(row) {
     defectLoading.value = true
     const params = {
-        WorkOrder: row.fkWorkorder
+        WorkOrder: row.workorder
     }
     SearchDefectList(params).then((res) => {
         if (res.code === 200) {
diff --git a/src/views/touchScreen/quality/components/TheWorkOrderList.vue b/src/views/touchScreen/quality/components/TheWorkOrderList.vue
new file mode 100644
index 0000000..bd585ea
--- /dev/null
+++ b/src/views/touchScreen/quality/components/TheWorkOrderList.vue
@@ -0,0 +1,86 @@
+<template>
+    <div>
+        <div class="mb-2">
+            <el-form inline="">
+                <el-form-item label="开始时间">
+                    <el-date-picker :clearable="false" v-model="queryParams.startDate" type="date" size="large" />
+                </el-form-item>
+                <el-form-item label="结束时间">
+                    <el-date-picker :clearable="false" v-model="queryParams.endDate" type="date" size="large" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" size="large" @click="getList()">
+                        查询
+                    </el-button>
+                </el-form-item>
+            </el-form>
+
+        </div>
+        <vxe-table height="600" v-loading="loading" :data="list">
+            <vxe-column type="seq" width="60"></vxe-column>
+            <vxe-column field="workorder" title="工单号"></vxe-column>
+            <vxe-column field="productionName" title="主体品名"></vxe-column>
+            <vxe-column field="productionCode" title="主体型号"></vxe-column>
+            <vxe-column field="stoveCode" title="炉号"></vxe-column>
+            <vxe-column field="planNum" title="计划数量"></vxe-column>
+            <vxe-column title="操作" width="160">
+                <template #default="{ row }">
+                    <el-button type="success" @click="handleChouse(row)">选择</el-button>
+                </template>
+            </vxe-column>
+        </vxe-table>
+        <!-- <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+            @pagination="getList" /> -->
+    </div>
+</template>
+
+<script setup>
+const { proxy } = getCurrentInstance()
+const props = defineProps({
+    workorder: {
+        type: String,
+        default: ''
+    },
+    processId: {
+        type: [String, Number],
+        default: ''
+    },
+})
+// watch([() => props.workorder, () => props.processId], () => {
+//     getList();
+// })
+const loading = ref(false)
+const list = ref([])
+const total = ref(0)
+const queryParams = reactive({
+    name: '',
+    startDate: proxy.dayjs().startOf('day').toDate(),
+    endDate: proxy.dayjs().endOf('day').toDate(),
+    pageNum: 1,
+    pageSize: 10,
+    processId: null,
+})
+import { GetWorkOrdersByDate } from '@/api/reportFlow/index'
+function getList() {
+    loading.value = true
+    list.value = []
+    let params = queryParams
+    params.workorder = props.workorder
+    params.processId = props.processId
+    GetWorkOrdersByDate(params).then(res => {
+        const { code, data } = res
+        if (code == 200) {
+            list.value = data
+            loading.value = false
+        }
+    })
+}
+function handleChouse(row) {
+    proxy.$emit('chouseWorkorder', row.workorder)
+}
+onMounted(() => {
+    getList()
+})
+</script>
+
+<style scoped></style>
diff --git a/src/views/touchScreen/quality/index.vue b/src/views/touchScreen/quality/index.vue
index 24d8642..34ba27d 100644
--- a/src/views/touchScreen/quality/index.vue
+++ b/src/views/touchScreen/quality/index.vue
@@ -4,34 +4,53 @@
 			<v-col cols="8">
 				<v-card color="blue-darken-4" class="left-content">
 					<v-tabs v-model="tab" bg-color="primary">
-						<v-tab value="工序报工">工序报工</v-tab>
-						<v-tab value="此工单工序记录">此工单工序记录</v-tab>
-						<v-tab value="此工序今日记录">此工序今日记录</v-tab>
-						<v-tab value="员工报工记录">员工报工记录</v-tab>
+						<v-tab value="1">入库检查记录表</v-tab>
+						<v-tab value="2">中间检查记录表</v-tab>
 						<v-tab value="工单查看">工单查看</v-tab>
 					</v-tabs>
 					<v-card-text>
 						<v-fade-transition>
 							<v-tabs-window v-model="tab">
-								<v-tabs-window-item value="工序报工">
-									<el-card class="mt-4">
+								<v-tabs-window-item value="1">
+									<v-btn class="bg-green-darken-3 mb-2" size="x-large" @click="getFormDefectData()">
+										刷新
+									</v-btn>
+									<v-btn class="bg-green-darken-3 mb-2 ml-2" size="x-large"
+										@click="getFormDefectData()">
+										生成入库检查记录表
+									</v-btn>
+									<el-row :gutter="5">
+										<el-col :span="24" v-for="(value, key) in qualityOptions" :key="key">
 
-									</el-card>
+											<div class="card-box">
+												<div class="card-header">
+													<span>{{ key }}</span>
+												</div>
+												<el-row>
+													<el-col :span="3" v-for="(item, index) in value" :key="index">
+														<div class="click-box" @mousedown="handleStart($event, item)"
+															@mouseup="handleEnd(item)"
+															@touchstart="handleStart($event, item)"
+															@touchend="handleEnd(item)">
+															<span class="click-title">{{ item.name }}</span>
+															<span class="click-num">{{ getClickItemNum(item)
+																}}</span>
+														</div>
+													</el-col>
+												</el-row>
+											</div>
+										</el-col>
+									</el-row>
 								</v-tabs-window-item>
-								<v-tabs-window-item value="此工单工序记录">
-									<el-card class="mt-4">
-									</el-card>
-								</v-tabs-window-item>
-								<v-tabs-window-item value="此工序今日记录">
-									<el-card class="mt-4">
-									</el-card>
-								</v-tabs-window-item>
-								<v-tabs-window-item value="员工报工记录">
+								<v-tabs-window-item value="2">
 									<el-card class="mt-4">
 									</el-card>
 								</v-tabs-window-item>
 								<v-tabs-window-item value="工单查看">
 									<el-card class="mt-4">
+										<TheWorkOrderList :workorder="formData.workorder"
+											@chouseWorkorder="getFormData">
+										</TheWorkOrderList>
 									</el-card>
 								</v-tabs-window-item>
 							</v-tabs-window>
@@ -41,7 +60,49 @@
 			</v-col>
 			<v-col cols="4">
 				<v-card color="blue-darken-4" class="right-content">
-
+					<scanInput @scanInput="handleScanInput"></scanInput>
+					<v-fade-transition>
+						<el-card v-if="formData.workorder" class="mt-4">
+							<el-form :model="formData" label-width="auto" label-suffix=":">
+								<el-form-item label="工单号">
+									<el-text class="formItem text-big">{{ formData.workorder }}</el-text>
+								</el-form-item>
+								<el-form-item v-if="processId !== 10" label="炉号">
+									<el-text class="formItem">{{ formData.stoveCode }}</el-text>
+								</el-form-item>
+								<el-form-item label="主体型号">
+									<el-text class="formItem">{{ formData.productionCode }}</el-text>
+								</el-form-item>
+								<el-form-item label="主体品名">
+									<el-text class="formItem">{{ formData.productionName }}</el-text>
+								</el-form-item>
+								<el-form-item label="计划数量">
+									<el-text class="formItem">{{ formData.planNum }}</el-text>
+								</el-form-item>
+								<el-form-item label="主体图号">
+									<el-text class="formItem">{{ formData.drawingCode }}</el-text>
+								</el-form-item>
+								<el-form-item label="版本号">
+									<el-text class="formItem">{{ formData.version }}</el-text>
+								</el-form-item>
+								<el-form-item label="材料编号">
+									<el-text class="formItem">{{ formData.materialCode }}</el-text>
+								</el-form-item>
+								<el-form-item label="材料型号">
+									<el-text class="formItem">{{ formData.materialName }}</el-text>
+								</el-form-item>
+								<el-form-item label="材质">
+									<el-text class="formItem">{{ formData.materialtextureCode }}</el-text>
+								</el-form-item>
+								<el-form-item label="工单日期">
+									<el-text class="formItem">{{ formData.workorderDate }}</el-text>
+								</el-form-item>
+								<el-form-item label="指示日期">
+									<el-text class="formItem">{{ formData.instructionDate }}</el-text>
+								</el-form-item>
+							</el-form>
+						</el-card>
+					</v-fade-transition>
 				</v-card>
 			</v-col>
 		</v-row>
@@ -54,25 +115,343 @@
 				</template>
 			</v-card>
 		</v-dialog>
+		<!-- 工单报工 -->
+		<el-dialog class="dialogBox" v-model.sync="updateDialogShow" title="缺陷项修改" width="400px" append-to-body
+			:close-on-click-modal="false">
+			<el-form label-width="auto">
+				<el-form-item label="工单号">
+					<el-text class="number-text">{{ formData.workorder }}</el-text>
+				</el-form-item>
+				<el-form-item label="缺陷项">
+					<el-text class="number-text">{{ updateName }}</el-text>
+				</el-form-item>
+				<el-form-item label="缺陷数">
+					<el-input-number class="number-text" v-model="updateNum"></el-input-number>
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button @click="updateDialogShow = false">取消</el-button>
+					<button class="button-box" type="primary" @click="updateDefectNum"> 确认修改 </button>
+				</div>
+			</template>
+		</el-dialog>
 	</v-container>
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import TheWorkOrderList from './components/TheWorkOrderList.vue'
+const { proxy } = getCurrentInstance()
+const tab = ref('1')
+const dialog = reactive({
+	show: false,
+	icon: 'mdi-alert',
+	class: 'bg-amber',
+	title: '提示',
+	text: '这是一段反馈'
+})
+/// ====================== 工单扫码 ======================
+import scanInput from '../components/scanInput.vue'
+import * as ReportApi from '@/api/reportFlow/index'
+import * as FQCApi from '@/api/reportFlow/fqc'
+function handleScanInput(val) {
+	getFormData(val)
+}
+const formData = ref({
+	id: null,
+	workorder: '',
+	instructionDate: '',
+	workorderDate: '',
+	planNum: 0,
+	finishNum: 0,
+})
+const processId = ref(null)
+function getFormData(workorder) {
+	const params = { workorder }
+	ReportApi.GetWorkOrderDetail(params).then(res => {
+		if (res.code == 200) {
+			if (res.data) {
+				formData.value = res.data
+				getFormDefectData(formData.value.workorder)
+			} else {
+				dialog.show = true
+				dialog.class = 'bg-amber'
+				dialog.title = '工单提示'
+				dialog.text = '工单号不正确,没有找到该工单'
+			}
+		}
+	})
+}
+function getFormDefectData(workorder) {
+	const _workorder = workorder ?? formData.value.workorder
+	if (!_workorder) {
+		dialog.show = true
+		dialog.class = 'bg-amber'
+		dialog.title = '工单提示'
+		dialog.text = '未选择工单，无法查看不良信息'
+		return
+	}
+	FQCApi.SearchDefectList({ WorkOrder: _workorder }).then(res => {
+		if (res.code === 200) {
+			// 初始化数据
+			clearGroupOptions()
+			// 修改数据
+			for (let item of res.data) {
+				setDefectNum(item.defectCode, item.number)
+			}
+		}
+	})
+}
+/// ================================================================================
 
-// Define reactive state
-const title = ref('Vue 3.0 Setup Syntax Sugar');
-const message = ref('This is a basic quality inspection template.');
-const counter = ref(0);
 
-// Define methods
-const incrementCounter = () => {
-	counter.value++;
-};
+/// ==================== 缺陷配置 =========================
+
+const qualityLoading = ref(false)
+const qualityOptionsClear = ref([])
+const qualityOptions = ref([])
+
+function getDefectConfigData(qcType = "") {
+	qualityLoading.value = true
+	const params = {
+		status: 1,
+		qcType
+	}
+	FQCApi.getDefectConfig(params).then(res => {
+		if (res.code == 200) {
+			if (res.data) {
+				const _groupList = getGroupOptions(res.data)
+				qualityOptions.value = _groupList
+				qualityOptionsClear.value = _groupList
+				qualityLoading.value = false
+			}
+		}
+	})
+}
+// 进行分组
+function getGroupOptions(list) {
+	let groupedOptions = list.reduce((groups, item) => {
+		if (!groups[item.group]) {
+			groups[item.group] = []
+		}
+		groups[item.group].push(item)
+		return groups
+	}, {})
+	return groupedOptions
+}
+// 还原数据
+function clearGroupOptions() {
+	qualityOptions.value = JSON.parse(JSON.stringify(qualityOptionsClear.value))
+}
+// 缺陷赋值
+function setDefectNum(code, num) {
+	const _list = qualityOptions.value
+	for (let category in _list) {
+		if (Array.isArray(_list[category])) {
+			let foundItem = _list[category].find((item) => item.code === code)
+			if (foundItem) {
+				// 更新找到的item的num属性
+				foundItem.num = num
+				return true // 可选返回true表示成功
+			}
+		}
+	}
+	console.log(`未找到code为${code}的缺陷项`)
+	return false // 可选返回false表示未找到
+}
+
+getDefectConfigData("入库检查")
+/// ======================================================
+
+/// ====================== 按钮操作 =====================
+const isLongPress = ref(false)
+const pressTimer = ref(null)
+const handleStart = (event, item) => {
+	// 如果是触摸事件，阻止其默认行为（如滚动）
+	if (event.type.startsWith('touch')) event.preventDefault()
+	// 清除之前的定时器
+	if (pressTimer.value) clearTimeout(pressTimer.value)
+	// 设置新的定时器，用于判断长按
+	pressTimer.value = setTimeout(() => {
+		isLongPress.value = true
+		console.log('长按')
+		// 这里执行长按的逻辑
+		showUpdateDialog(item)
+	}, 500) // 长按的阈值设为500毫秒
+}
+
+const handleEnd = (item) => {
+	// 清除定时器
+	if (pressTimer.value) clearTimeout(pressTimer.value)
+	// 这里执行短按或长按结束的逻辑
+	clickQualityIte(item)
+	isLongPress.value = false
+}
+// 短按新增
+function clickQualityIte(item) {
+	// 长按则跳过
+	if (isLongPress.value) {
+		return
+	}
+	const workOrder = formData.value.workorder
+	if (workOrder === null || workOrder === '') {
+		dialog.show = true
+		dialog.class = 'bg-amber'
+		dialog.title = '工单提示'
+		dialog.text = '请先扫描工单！'
+		return
+	}
+	const newNum = getClickItemNum(item) + 1
+	const params = {
+		WorkOrder: formData.value.workorder,
+		DefectCode: item.code,
+		num: item.num ?? 0,
+	}
+	FQCApi.AddDefectNum(params).then((res) => {
+		if (res.code != 200) {
+			proxy.$message.error('添加缺陷项异常')
+			return
+		}
+	})
+	item.num = newNum
+}
+// 长按弹出修改框
+const updateDialogShow = ref(false)
+const updateName = ref('')
+const updateCode = ref('')
+const updateNum = ref(0)
+function showUpdateDialog(item) {
+	const workOrder = formData.value.workorder
+	if (workOrder === null || workOrder === '') {
+		dialog.show = true
+		dialog.class = 'bg-amber'
+		dialog.title = '工单提示'
+		dialog.text = '请先扫描或选择工单！'
+		return
+	}
+	updateName.value = item.name
+	updateCode.value = item.code
+	updateNum.value = item.num ?? 0
+	updateDialogShow.value = true
+}
+function updateDefectNum() {
+	// 短按则跳过
+	// if (!isLongPress.value) {
+	// 	return
+	// }
+	const workOrder = formData.value.workorder
+	if (workOrder === null || workOrder === '') {
+		dialog.show = true
+		dialog.class = 'bg-amber'
+		dialog.title = '工单提示'
+		dialog.text = '请先扫描或选择工单！'
+		return
+	}
+	const params = {
+		WorkOrder: formData.value.workorder,
+		DefectCode: updateCode.value,
+		num: updateNum.value,
+	}
+	FQCApi.UpdateDefectNum(params).then((res) => {
+		if (res.code === 200) {
+			dialog.show = true
+			dialog.class = 'bg-green'
+			dialog.title = '修改提示'
+			dialog.text = '修改缺陷项成功！'
+			setDefectNum(params.DefectCode, params.num)
+			updateDialogShow.value = false
+		} else {
+			dialog.show = true
+			dialog.class = 'bg-red'
+			dialog.title = '修改提示'
+			dialog.text = '修改缺陷项异常！'
+			return
+		}
+	})
+}
+// 数据解析,错误数据排除
+function getClickItemNum(item) {
+	if (!item.num) {
+		return 0
+	}
+	return item.num * 1
+}
+/// =====================================================
+
 </script>
 
 <style scoped>
-h1 {
-	color: #42b983;
+.left-content {
+	min-height: 88vh;
+
+}
+
+.right-content {
+	min-height: 88vh;
+	padding: 20px;
+}
+
+.card-box {
+	height: 100%;
+	background-color: #000071;
+}
+
+.card-header {
+	color: white;
+	height: 60px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 24px;
+	font-weight: 700;
+}
+
+.click-box {
+	border-radius: 5%;
+	margin: 5px;
+	height: 150px;
+	background-color: #1B5E20;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: space-between;
+	color: white;
+}
+
+.click-title {
+	width: 100%;
+	height: 100px;
+	font-size: 26px;
+	font-weight: 600;
+	text-align: center;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.click-num {
+	font-size: 30px;
+	font-weight: 600;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.workorder-active {
+	background-color: rgb(82.4, 155.2, 46.4);
+}
+
+.button-left-top {
+	width: 30%;
+}
+
+.button-box {
+	margin-left: 20px;
+	width: 100px;
+	height: 40px;
+	border: 1px solid #eeeeee;
+	border-radius: 10%;
+	background: #0055ff;
+	color: white;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/touchScreen/report/index.vue b/src/views/touchScreen/report/index.vue
index 33296db..e6c23fe 100644
--- a/src/views/touchScreen/report/index.vue
+++ b/src/views/touchScreen/report/index.vue
@@ -408,7 +408,6 @@ function queryUserReport() {
 
 .left-content {
     min-height: 88vh;
-    padding: 20px;
 }
 
 .right-content {