From df6a6b0a99d37894e20f08c97bce4feeb4fe7b62 Mon Sep 17 00:00:00 2001
From: GaoF <gf18734201506@163.com>
Date: Thu, 8 Aug 2024 09:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employee/personnel/detail/index.vue       |  2 +-
 .../employee/personnelReport/detail/index.vue | 17 ++++++----
 .../employee/personnelReport/index.vue        | 34 ++++++++++++++-----
 .../productionCenter/task/index.vue           |  4 +--
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/views/productionBusiness/employee/personnel/detail/index.vue b/src/views/productionBusiness/employee/personnel/detail/index.vue
index a7423dd..483bd7e 100644
--- a/src/views/productionBusiness/employee/personnel/detail/index.vue
+++ b/src/views/productionBusiness/employee/personnel/detail/index.vue
@@ -5,7 +5,7 @@
 		</template>
 	</a-page-header>
 
-	<a-card :bordered="false" title="品牌">
+	<a-card :bordered="false" title="人员基本信息">
 		<DynamicForm
 			:allDisabled="route.query.type === 'SEARCH'"
 			:formItems="baseFormItems"
diff --git a/src/views/productionBusiness/employee/personnelReport/detail/index.vue b/src/views/productionBusiness/employee/personnelReport/detail/index.vue
index a6230f1..04096f1 100644
--- a/src/views/productionBusiness/employee/personnelReport/detail/index.vue
+++ b/src/views/productionBusiness/employee/personnelReport/detail/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<a-page-header style="padding: 10px; font-size: 20px" @back="handleBack('/basicData/unit')">
 		<template #extra>
-			<a-button key="1" type="primary" @click="onSubmitForm">保存</a-button>
+			<a-button v-if="route.query.type === 'ADD' " type="primary" @click="onSubmitForm">保存</a-button>
 		</template>
 	</a-page-header>
 	<a-card :bordered="false" title="任务单信息">
@@ -13,7 +13,7 @@
 			ref="formRef1"
 		>
 			<template #materialNameSlot="{ model, item }">
-				<a-input readonly v-bind="{ ...item.attrs }" v-model:value="model[item.name]" @click="openMateriel"></a-input>
+				<a-input :disabled="route.query.type === 'SEARCH'" readonly v-bind="{ ...item.attrs }" v-model:value="model[item.name]" @click="openMateriel"></a-input>
 			</template>
 			<template #produceUnitNameSlot="{ model, item }">
 				<a-select v-bind="{ ...item.attrs }" v-model:value="model[item.name]" :options="unitList"></a-select>
@@ -60,6 +60,7 @@
 								:min="0.01"
 								@change="amountChange($event, record)"
 								:precision="2"
+								:disabled="route.query.type === 'SEARCH'"
 							/>
 						</template>
 
@@ -100,7 +101,6 @@
 <script setup name="personnelReportDetail">
 	import employeeApi from '@/api/base/employee/employeeApi'
 	import employeeCategoryApi from '@/api/base/employee/employeeCategoryApi'
-
 	import manualTaskApi from '@/api/base/manual-task/manualTaskApi'
 
 	import MaterielSelectorPlus from '@/components/Selector/materielSelectorPlus.vue'
@@ -152,7 +152,7 @@
 			type: 'a-input',
 			attrs: {
 				disabled: true,
-				placeholder: '请输入物料'
+				placeholder: '请输入基本单位'
 			}
 		},
 		{
@@ -162,7 +162,8 @@
 			slotName: 'productionLineNameSlot',
 			attrs: {
 				placeholder: '请选择生产线',
-				allowClear: true
+				allowClear: true,
+				disabled: route.query.type === 'SEARCH'
 			}
 		},
 		{
@@ -198,7 +199,11 @@
 	onMounted(async () => {
 		fetchData(route.query.type).then(async (res) => {
 			if (res) {
-				console.log(res)
+				manualTaskApi.manualTaskDetailPage({
+					manualTaskId: res.id
+				}).then(detailPage => {
+					dataSource.value = detailPage.records
+				})
 			}
 		})
 	})
diff --git a/src/views/productionBusiness/employee/personnelReport/index.vue b/src/views/productionBusiness/employee/personnelReport/index.vue
index c2ac84c..bc6143c 100644
--- a/src/views/productionBusiness/employee/personnelReport/index.vue
+++ b/src/views/productionBusiness/employee/personnelReport/index.vue
@@ -89,7 +89,7 @@
 							</a>
 						</a-tooltip>
 
-						<a-divider type="vertical" v-if="hasPerm(['customerEdit', 'customerDelete'], 'and')" />
+<!--						<a-divider type="vertical" v-if="hasPerm(['customerEdit', 'customerDelete'], 'and')" />
 						<a-tooltip title="查看">
 							<a
 								@click="
@@ -101,7 +101,7 @@
 								v-if="hasPerm('customerEdit')"
 							>
 								<FormOutlined />
-								<!--									编辑-->
+								&lt;!&ndash;									编辑&ndash;&gt;
 							</a>
 						</a-tooltip>
 
@@ -109,9 +109,9 @@
 						<a-popconfirm title="确定要删除吗？" @confirm="deleteRecord(record)">
 							<a-button type="link" danger size="small" v-if="hasPerm('customerDelete')">
 								<DeleteOutlined />
-								<!--										删除-->
+								&lt;!&ndash;										删除&ndash;&gt;
 							</a-button>
-						</a-popconfirm>
+						</a-popconfirm>-->
 					</a-space>
 				</template>
 			</template>
@@ -135,19 +135,35 @@
 			ellipsis: true
 		},
 		{
-			title: '名称',
-			dataIndex: 'name',
+			title: '任务单名称',
+			dataIndex: 'materialName',
 			align: 'center',
 			resizable: true,
 			width: 300,
 			ellipsis: true
 		},
 		{
-			title: '可用状态',
-			dataIndex: 'enabledState',
+			title: '任务单名称',
+			dataIndex: 'productionLineName',
 			align: 'center',
 			resizable: true,
-			width: 100,
+			width: 300,
+			ellipsis: true
+		},
+		{
+			title: '总人数',
+			dataIndex: 'totalEmployee',
+			align: 'center',
+			resizable: true,
+			width: 300,
+			ellipsis: true
+		},
+		{
+			title: '总金额',
+			dataIndex: 'totalMoney',
+			align: 'center',
+			resizable: true,
+			width: 300,
 			ellipsis: true
 		},
 		{
diff --git a/src/views/productionBusiness/productionCenter/task/index.vue b/src/views/productionBusiness/productionCenter/task/index.vue
index 634025f..22855af 100644
--- a/src/views/productionBusiness/productionCenter/task/index.vue
+++ b/src/views/productionBusiness/productionCenter/task/index.vue
@@ -72,7 +72,7 @@
 						<a-tooltip title="查看">
 							<a
 								@click="
-									navigateTo('/basicData/publicAccount/detail', {
+									navigateTo('/task/detail', {
 										type: 'SEARCH',
 										id: record.id
 									})
@@ -88,7 +88,7 @@
 						<a-tooltip title="查看">
 							<a
 								@click="
-									navigateTo('/basicData/publicAccount/detail', {
+									navigateTo('/task/detail', {
 										type: 'EDIT',
 										id: record.id
 									})