From 5f6d4a9923777d97912033f97e1dd517f52ef4b0 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 14 Dec 2023 15:12:30 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/shopOrderProductView.vue | 17 +++++++++++++++++
 src/views/modules/taskmanage/mysendtasklist.vue |  2 +-
 src/views/modules/taskmanage/tasklist.vue       |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/production/shopOrderProductView.vue b/src/views/modules/production/shopOrderProductView.vue
index cabebf2..eb6dff0 100644
--- a/src/views/modules/production/shopOrderProductView.vue
+++ b/src/views/modules/production/shopOrderProductView.vue
@@ -266,6 +266,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          // }, {
+          //   tableId: "orderView",
+          //   tableName: this.$route.meta.title,
+          //   columnProp: "jianyanReport",
+          //   columnLabel: "加工组",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   columnWidth: 60,
+          //   format: null,
+          //   functionId: this.$route.meta.menuId,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          //   serialNumber: null,
+          //   columnType: null,
+          //   align: 'right'
           }, {
             tableId: "orderView",
             tableName: this.$route.meta.title,
diff --git a/src/views/modules/taskmanage/mysendtasklist.vue b/src/views/modules/taskmanage/mysendtasklist.vue
index 5bafe83..913276d 100644
--- a/src/views/modules/taskmanage/mysendtasklist.vue
+++ b/src/views/modules/taskmanage/mysendtasklist.vue
@@ -113,7 +113,7 @@
             label="操作">
             <template slot-scope="scope">
               <el-link type="text" size="small" @click="addOrUpdateHandle(scope.row.taskId)">修改 |</el-link>
-              <el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改最终状态 |</el-link>
+              <el-link type="text" size="small" @click="updateStatusDialog(scope.row)" v-if="scope.row.allowCloseByHand==='Y'">更改最终状态 |</el-link>
               <el-link type="text" size="small" @click="chatHistoryDialog(scope.row)">沟通 |</el-link>
               <el-link type="text" size="small" @click="annex(scope.row)">附件 |</el-link>
 <!--              <el-link type="text" size="small" @click="annex(scope.row.id)"> 沟通附件</el-link>-->
diff --git a/src/views/modules/taskmanage/tasklist.vue b/src/views/modules/taskmanage/tasklist.vue
index 9181039..0b9a617 100644
--- a/src/views/modules/taskmanage/tasklist.vue
+++ b/src/views/modules/taskmanage/tasklist.vue
@@ -108,7 +108,7 @@
             label="操作">
             <template slot-scope="scope">
 <!--              <el-link type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改 |</el-link>-->
-<!--              <el-link type="text" size="small" @click="updateStatusDialog(scope.row)">更改最终状态 |</el-link>-->
+<!--              <el-link type="text" size="small" @click="updateStatusDialog(scope.row)" v-if="scope.row.allowCloseByHand==='Y'>更改最终状态 |</el-link>-->
 <!--              <el-link type="text" size="small" @click="chatHistoryDialog(scope.row)">沟通记录 |</el-link>-->
               <el-link type="text" size="small" @click="annex(scope.row)">附件</el-link>
 <!--              <el-link v-if="isAuth('taskmanage:tasklist:delete')" type="text" size="small"-->