From 4e8a819106352e11a5a8131d0cb445e1c83c796f Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 19 Aug 2024 15:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/biz/assignTasks/assignForm.vue     | 11 +++++++----
 .../src/views/biz/assignTasks/index.vue          | 16 ++++++++++++++--
 .../src/views/biz/qualityfeedback/indexAudit.vue |  4 ++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/assignForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/assignForm.vue
index d8c80b8e..b0b6a063 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/assignForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/assignForm.vue
@@ -33,7 +33,7 @@
     <el-card class="hl-card-info">
       <el-row>
         <el-col>
-          <el-button type="primary" size="large" @click="onAddItem">新增</el-button>
+          <el-button type="primary" size="large" @click="onAddItem" v-if="fType!=='detail'">新增</el-button>
         </el-col>
         <el-col>
           <el-card class="hl-incard">
@@ -81,7 +81,7 @@
                         min="0"
                         :precision="2"
                         class="!w-240px"
-                        :disabled="detailDisabled"
+                        :disabled="fType=='detail'"
                         v-model="row.workTime"
                         placeholder="本次报工工时"
                       />
@@ -100,7 +100,7 @@
                         min="0"
                         :precision="0"
                         class="!w-240px"
-                        :disabled="detailDisabled"
+                        :disabled="fType=='detail'"
                         v-model="row.amount"
                         placeholder="本次报工数量"
                       />
@@ -195,7 +195,10 @@ const queryParamsd = reactive({
 })
 /** 打开弹窗 */
 const FprocedureStatus = ref(false)
-const open = async (id?: number, val?: any) => {
+const fType = ref()
+const open = async (id?: number, val?: any,type?:string) => {
+  fType.value=undefined
+  fType.value=type
   if (val.procedureStatus == 2) {
     FprocedureStatus.value = true
   }else{
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue
index 3b749b50..5f1434a2 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/assignTasks/index.vue
@@ -197,14 +197,25 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center" width="100">
           <template #default="scope">
+            <el-button
+              link
+              type="primary"
+              @click="openForm(scope.row.id, scope.row,'detail')"
+              v-hasPermi="['biz:task-report:update']"
+              v-if="scope.row.procedureStatus == 2"
+            >
+              查看
+            </el-button>
             <el-button
               link
               type="primary"
               @click="openForm(scope.row.id, scope.row)"
               v-hasPermi="['biz:task-report:update']"
+              v-else
             >
               报工
             </el-button>
+           
           </template>
         </el-table-column>
       </el-table>
@@ -230,6 +241,7 @@ import AssignForm from './assignForm.vue'
 import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
 // import UserSelect from '@/views/biz/hlvuestyle/userSelect.vue'
 import ProcedureSelect from '@/views/biz/hlvuestyle/procedureSelect.vue'
+import { de } from 'element-plus/es/locale'
 
 defineOptions({ name: 'TasksAssign' })
 
@@ -349,8 +361,8 @@ const openDispatching = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (id?: number, val?: any) => {
-  formRef.value.open(id, val)
+const openForm = (id?: number, val?: any,type?:string) => {
+  formRef.value.open(id, val,type)
 }
 
 /** 删除按钮操作 */
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/qualityfeedback/indexAudit.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/qualityfeedback/indexAudit.vue
index 3f609fb1..0842c7a9 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/qualityfeedback/indexAudit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/qualityfeedback/indexAudit.vue
@@ -45,14 +45,14 @@
             ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
           >
           <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-          <el-button
+          <!-- <el-button
             type="primary"
             plain
             @click="openDetail('create')"
             v-hasPermi="['biz:quality-feedback:create']"
           >
             <Icon icon="ep:plus" class="mr-5px" /> 新增
-          </el-button>
+          </el-button> -->
           <el-button type="success" plain @click="handleExport()">
             <Icon icon="ep:upload" class="mr-5px" /> 导出
           </el-button>