Merge pull request 'master' (#73) from master into test

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/73

src/views/task-management/all-work-order/index.vue

@@ -9,7 +9,7 @@
 import { reactive, shallowRef } from 'vue';
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import WorkDialog from '../components/WorkDialog.vue';
-import { orderdDetele, orderdClose} from "@/api/order/order.js"
+import { orderdDetele, orderdClose } from "@/api/order/order.js"
 
 const rowData = ref()
 const workDialogRef = ref()
@@ -263,8 +263,7 @@ const handleDetail = (row) => {
 }
 
 const handleClose = async (row) => {
-  console.log(row);
+  if (row.orderState !== '2') {
-
     ElMessageBox.confirm(
       '确定要关单吗?',
       '温馨提示',
@@ -289,6 +288,15 @@ const handleClose = async (row) => {
           message: '关闭失败',
         })
       })
+  } else {
+    ElMessageBox.alert('此工单已被关闭！', '温馨提示', {
+      // if you want to disable its autofocus
+      // autofocus: false,
+      type:'warning',
+      confirmButtonText: '确定',
+    })
+  }
+
 }
 
 const handleDelete = async (row) => {

src/views/task-management/historical-work-order/index.vue

@@ -265,8 +265,7 @@ const handleDetail = (row) => {
 }
 
 const handleClose = async (row) => {
-  // console.log(row.orderNumber);
+  if (row.orderState !== '2') {
-
     ElMessageBox.confirm(
       '确定要关单吗?',
       '温馨提示',
@@ -291,6 +290,15 @@ const handleClose = async (row) => {
           message: '关闭失败',
         })
       })
+  } else {
+    ElMessageBox.alert('此工单已被关闭！', '温馨提示', {
+      // if you want to disable its autofocus
+      // autofocus: false,
+      type:'warning',
+      confirmButtonText: '确定',
+    })
+  }
+
 }
 
 const handleDelete = async (row) => {

src/views/task-management/pending-work-order/index.vue

@@ -265,8 +265,7 @@ const handleDetail = (row) => {
 }
 
 const handleClose = async (row) => {
-  // console.log(row.orderNumber);
+  if (row.orderState !== '2') {
-
     ElMessageBox.confirm(
       '确定要关单吗?',
       '温馨提示',
@@ -291,6 +290,15 @@ const handleClose = async (row) => {
           message: '关闭失败',
         })
       })
+  } else {
+    ElMessageBox.alert('此工单已被关闭！', '温馨提示', {
+      // if you want to disable its autofocus
+      // autofocus: false,
+      type:'warning',
+      confirmButtonText: '确定',
+    })
+  }
+
 }
 
 const handleDelete = async (row) => {