From 18508b5ecc58dccd01e67da6e8bc5766fb2d4702 Mon Sep 17 00:00:00 2001
From: KindSeven <2845382437@qq.com>
Date: Sat, 14 Sep 2024 23:51:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E4=BA=86=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=88=E5=85=B3=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=89=E7=9A=84=E5=AF=B9=E6=8E=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E5=AF=B9=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E9=83=A8=E5=88=86,=E5=B0=86=E5=85=B6=E4=BB=A3=E7=A0=81copy?=
 =?UTF-8?q?=E5=88=B0=E4=BA=86=E5=8E=86=E5=8F=B2=E5=92=8C=E5=BE=85=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../historical-work-order/index.vue           | 63 +++++++++++--------
 .../pending-work-order/index.vue              | 63 +++++++++++--------
 2 files changed, 74 insertions(+), 52 deletions(-)

diff --git a/src/views/task-management/historical-work-order/index.vue b/src/views/task-management/historical-work-order/index.vue
index 3d5e12f..b20d76d 100644
--- a/src/views/task-management/historical-work-order/index.vue
+++ b/src/views/task-management/historical-work-order/index.vue
@@ -1,17 +1,18 @@
 <template>
   <fvSearchForm :searchConfig="searchConfig" @search="search">
-    <FvSelect></FvSelect>
   </fvSearchForm>
   <fvTable ref="tableIns" :tableConfig="tableConfig" :data="mockData" @headBtnClick="headBtnClick"></fvTable>
-  <WorkDialog ref="workDialogRef"></WorkDialog>
-
+  <WorkDialog ref="workDialogRef" :rowData="rowData" />
 </template>
 
 <script setup lang="jsx">
-import { shallowRef } from 'vue';
+import { isShallow, reactive, shallowRef } from 'vue';
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import WorkDialog from '../components/WorkDialog.vue';
+import { orderdDetele, orderdClose, orderAdd } from "@/api/order/order.js"
 
+const rowData = ref()
+const isShow = ref(false)
 const workDialogRef = ref()
 const router = useRouter()
 const tableIns = ref()
@@ -59,7 +60,6 @@ const searchConfig = reactive([
       cacheKey: 'work_order_status',
       clearable: true,
       filterable: true,
-      filterable: true,
     },
     component: shallowRef(fvSelect),
   }, {
@@ -83,7 +83,7 @@ const searchConfig = reactive([
   },
   {
     label: '创建日期',
-    prop: 'requirementName',
+    prop: 'requirementDate',
     props: {
       placeholder: '请选择',
       clearable: true,
@@ -92,7 +92,7 @@ const searchConfig = reactive([
     component: 'el-date-picker',
   }, {
     label: '处理时间',
-    prop: 'requirementName',
+    prop: 'requirementDate',
     props: {
       placeholder: '请选择',
       clearable: true,
@@ -101,7 +101,7 @@ const searchConfig = reactive([
     component: 'el-date-picker',
   }, {
     label: '完成时间',
-    prop: 'requirementName',
+    prop: 'requirementDate',
     props: {
       placeholder: '请选择',
       clearable: true,
@@ -121,22 +121,25 @@ const tableConfig = reactive({
       width: 80,
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'orderNumber',
       label: '工单号',
-      align: 'center'
+      align: 'center',
+      width: 200
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'siteName',
       label: '工单名称',
-      align: 'center'
+      align: 'center',
+      width: 200
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'orderContent',
       label: '工单内容',
-      align: 'center'
+      align: 'center',
+      width: 200
     },
     {
-      prop: 'state',
+      prop: 'orderState',
       label: '工单状态',
       align: 'center',
       showOverflowTooltip: false,
@@ -162,29 +165,29 @@ const tableConfig = reactive({
       }
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'operationUser',
       label: '处理人',
       align: 'center'
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'processedContent',
       label: '处理内容',
       align: 'center'
     },
     {
-      prop: 'workOrderTime',
+      prop: 'createTime',
       label: '创建时间',
       align: 'center',
       width: 200
     },
     {
-      prop: 'workOrderTime',
+      prop: 'processedTime',
       label: '处理时间',
       align: 'center',
       width: 200
     },
     {
-      prop: 'workOrderTime',
+      prop: 'completionTime',
       label: '完成时间',
       align: 'center',
       width: 200
@@ -197,6 +200,8 @@ const tableConfig = reactive({
       width: 150,
       showOverflowTooltip: false,
       currentRender: ({ row, index }) => {
+        // console.log(row);
+
         let btn = []
         btn.push({ label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary' })
         btn.push({ label: '关单', prem: auths.detail, func: () => handleClose(row), type: 'primary' })
@@ -220,14 +225,14 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/order/list',
   params: {},
   btns: [
     // {name: '新增', key: 'add', color: '#DED0B2', auth: auths.report},
   ]
 })
 const headBtnClick = (key) => {
-  console.log(key);
+  // console.log(key);
 
   switch (key) {
     case 'add':
@@ -238,9 +243,12 @@ const headBtnClick = (key) => {
 
 const handleDetail = (row) => {
   workDialogRef.value.open(row)
+  rowData.value = row
 }
 
-const handleClose = (row) => {
+const handleClose = async (row) => {
+  // console.log(row.orderNumber);
+
   ElMessageBox.confirm(
     '确定要关单吗?',
     '温馨提示',
@@ -250,7 +258,8 @@ const handleClose = (row) => {
       type: 'warning',
     }
   )
-    .then(() => {
+    .then(async () => {
+      await orderdClose(row.orderNumber)
       ElMessage({
         type: 'success',
         message: '关闭成功',
@@ -264,7 +273,8 @@ const handleClose = (row) => {
     })
 }
 
-const handleDelete = (row) => {
+const handleDelete = async (row) => {
+
   ElMessageBox.confirm(
     '确定要删除吗?',
     '温馨提示',
@@ -274,7 +284,8 @@ const handleDelete = (row) => {
       type: 'warning',
     }
   )
-    .then(() => {
+    .then(async () => {
+      await orderdDetele(row.orderNumber)
       ElMessage({
         type: 'success',
         message: '删除成功',
diff --git a/src/views/task-management/pending-work-order/index.vue b/src/views/task-management/pending-work-order/index.vue
index 3d5e12f..b20d76d 100644
--- a/src/views/task-management/pending-work-order/index.vue
+++ b/src/views/task-management/pending-work-order/index.vue
@@ -1,17 +1,18 @@
 <template>
   <fvSearchForm :searchConfig="searchConfig" @search="search">
-    <FvSelect></FvSelect>
   </fvSearchForm>
   <fvTable ref="tableIns" :tableConfig="tableConfig" :data="mockData" @headBtnClick="headBtnClick"></fvTable>
-  <WorkDialog ref="workDialogRef"></WorkDialog>
-
+  <WorkDialog ref="workDialogRef" :rowData="rowData" />
 </template>
 
 <script setup lang="jsx">
-import { shallowRef } from 'vue';
+import { isShallow, reactive, shallowRef } from 'vue';
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import WorkDialog from '../components/WorkDialog.vue';
+import { orderdDetele, orderdClose, orderAdd } from "@/api/order/order.js"
 
+const rowData = ref()
+const isShow = ref(false)
 const workDialogRef = ref()
 const router = useRouter()
 const tableIns = ref()
@@ -59,7 +60,6 @@ const searchConfig = reactive([
       cacheKey: 'work_order_status',
       clearable: true,
       filterable: true,
-      filterable: true,
     },
     component: shallowRef(fvSelect),
   }, {
@@ -83,7 +83,7 @@ const searchConfig = reactive([
   },
   {
     label: '创建日期',
-    prop: 'requirementName',
+    prop: 'requirementDate',
     props: {
       placeholder: '请选择',
       clearable: true,
@@ -92,7 +92,7 @@ const searchConfig = reactive([
     component: 'el-date-picker',
   }, {
     label: '处理时间',
-    prop: 'requirementName',
+    prop: 'requirementDate',
     props: {
       placeholder: '请选择',
       clearable: true,
@@ -101,7 +101,7 @@ const searchConfig = reactive([
     component: 'el-date-picker',
   }, {
     label: '完成时间',
-    prop: 'requirementName',
+    prop: 'requirementDate',
     props: {
       placeholder: '请选择',
       clearable: true,
@@ -121,22 +121,25 @@ const tableConfig = reactive({
       width: 80,
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'orderNumber',
       label: '工单号',
-      align: 'center'
+      align: 'center',
+      width: 200
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'siteName',
       label: '工单名称',
-      align: 'center'
+      align: 'center',
+      width: 200
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'orderContent',
       label: '工单内容',
-      align: 'center'
+      align: 'center',
+      width: 200
     },
     {
-      prop: 'state',
+      prop: 'orderState',
       label: '工单状态',
       align: 'center',
       showOverflowTooltip: false,
@@ -162,29 +165,29 @@ const tableConfig = reactive({
       }
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'operationUser',
       label: '处理人',
       align: 'center'
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'processedContent',
       label: '处理内容',
       align: 'center'
     },
     {
-      prop: 'workOrderTime',
+      prop: 'createTime',
       label: '创建时间',
       align: 'center',
       width: 200
     },
     {
-      prop: 'workOrderTime',
+      prop: 'processedTime',
       label: '处理时间',
       align: 'center',
       width: 200
     },
     {
-      prop: 'workOrderTime',
+      prop: 'completionTime',
       label: '完成时间',
       align: 'center',
       width: 200
@@ -197,6 +200,8 @@ const tableConfig = reactive({
       width: 150,
       showOverflowTooltip: false,
       currentRender: ({ row, index }) => {
+        // console.log(row);
+
         let btn = []
         btn.push({ label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary' })
         btn.push({ label: '关单', prem: auths.detail, func: () => handleClose(row), type: 'primary' })
@@ -220,14 +225,14 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/order/list',
   params: {},
   btns: [
     // {name: '新增', key: 'add', color: '#DED0B2', auth: auths.report},
   ]
 })
 const headBtnClick = (key) => {
-  console.log(key);
+  // console.log(key);
 
   switch (key) {
     case 'add':
@@ -238,9 +243,12 @@ const headBtnClick = (key) => {
 
 const handleDetail = (row) => {
   workDialogRef.value.open(row)
+  rowData.value = row
 }
 
-const handleClose = (row) => {
+const handleClose = async (row) => {
+  // console.log(row.orderNumber);
+
   ElMessageBox.confirm(
     '确定要关单吗?',
     '温馨提示',
@@ -250,7 +258,8 @@ const handleClose = (row) => {
       type: 'warning',
     }
   )
-    .then(() => {
+    .then(async () => {
+      await orderdClose(row.orderNumber)
       ElMessage({
         type: 'success',
         message: '关闭成功',
@@ -264,7 +273,8 @@ const handleClose = (row) => {
     })
 }
 
-const handleDelete = (row) => {
+const handleDelete = async (row) => {
+
   ElMessageBox.confirm(
     '确定要删除吗?',
     '温馨提示',
@@ -274,7 +284,8 @@ const handleDelete = (row) => {
       type: 'warning',
     }
   )
-    .then(() => {
+    .then(async () => {
+      await orderdDetele(row.orderNumber)
       ElMessage({
         type: 'success',
         message: '删除成功',