From eca324378304932bd6c5bccf255b913987a83bd7 Mon Sep 17 00:00:00 2001
From: KindSeven <2845382437@qq.com>
Date: Wed, 11 Sep 2024 02:03:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E4=BA=866=E4=B8=AA?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2form=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86table?=
 =?UTF-8?q?=E4=B8=AD=E5=B7=A5=E5=8D=95=E5=8F=B7=EF=BC=8C=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=AD=89=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E4=BA=86=E5=85=B3=E9=97=AD=E4=B8=8E=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84box=E5=BC=B9=E7=AA=97=EF=BC=8C=E6=AD=A3=E5=9C=A8?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85=E8=AF=A6=E6=83=85Edit=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fvcomponents/fvSearchForm/index.vue       |   2 +-
 .../task-management/all-work-order/index.vue  | 223 +++++++++++++++---
 .../task-management/components/WorkEdit.vue   |  26 ++
 3 files changed, 219 insertions(+), 32 deletions(-)
 create mode 100644 src/views/task-management/components/WorkEdit.vue

diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue
index 8afc13b..285ec08 100644
--- a/src/fvcomponents/fvSearchForm/index.vue
+++ b/src/fvcomponents/fvSearchForm/index.vue
@@ -33,7 +33,7 @@
           <el-button v-if="searchConfig.length>=4" link type="primary" @click="showMore = !showMore">
             {{ showMore ? '收起' : '展开' }}
           </el-button>
-          <el-button type="primary" @click="getValues" :icon="Search">搜索</el-button>
+          <el-button type="primary" @click="getValues" :icon="Search">查询</el-button>
           <el-button @click="handleReset" :icon="Refresh">重置</el-button>
         </el-form-item>
       </el-col>
diff --git a/src/views/task-management/all-work-order/index.vue b/src/views/task-management/all-work-order/index.vue
index d0dc3a6..fe3efe4 100644
--- a/src/views/task-management/all-work-order/index.vue
+++ b/src/views/task-management/all-work-order/index.vue
@@ -1,24 +1,28 @@
 <template>
   <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
   <fvTable ref="tableIns" :tableConfig="tableConfig" :data="mockData" @headBtnClick="headBtnClick"></fvTable>
+  <WorkEdit ref="workEditRef"></WorkEdit>
 </template>
 
 <script setup lang="jsx">
+import WorkEdit from '../components/WorkEdit.vue';
 
+const workEditRef = ref()
 const router = useRouter()
 const tableIns = ref()
 //todo 外部模拟数据, 接口一出来, 直接在下方 tableConfig 的api处填写就行
-const mockData=ref([
+const mockData = ref([
   {
-    workOrderNumber:1211,
-    state:0,
-    callState:0
+    workOrderNumber: 1211,
+    workOrderTime: '2022-02-09 00 : 12',
+    state: 0,
+    callState: 0
   },
   {
-    workOrderNumber:232,
-    state:1,
-    callState:1
-  },
+    workOrderNumber: 232,
+    state: 1,
+    callState: 1
+  }
 ])
 const auths = reactive({
   report: ['mosr:collect:reported'],
@@ -33,8 +37,73 @@ const searchConfig = reactive([
       checkStrictly: true
     },
     component: 'el-input',
+  }, {
+    label: '工单名称',
+    prop: 'requirementName',
+    props: {
+      placeholder: '请输入工单名查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  }, {
+    label: '工单状态',
+    prop: 'requirementName',
+    props: {
+      placeholder: '请输入工单状态查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  }, {
+    label: '处理人',
+    prop: 'requirementName',
+    props: {
+      placeholder: '请输入处理人查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  }, {
+    label: '关单人',
+    prop: 'requirementName',
+    props: {
+      placeholder: '请输入关单人查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
   },
+  {
+    label: '创建日期',
+    prop: 'requirementName',
+    props: {
+      placeholder: '',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-date-picker',
+  }, {
+    label: '处理时间',
+    prop: 'requirementName',
+    props: {
+      placeholder: '',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-date-picker',
+  }, {
+    label: '完成时间',
+    prop: 'requirementName',
+    props: {
+      placeholder: '',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-date-picker',
+  }
 ])
+
 const tableConfig = reactive({
   columns: [
     {
@@ -49,14 +118,24 @@ const tableConfig = reactive({
       label: '工单号',
       align: 'center'
     },
+    {
+      prop: 'workOrderNumber',
+      label: '工单名称',
+      align: 'center'
+    },
+    {
+      prop: 'workOrderNumber',
+      label: '工单内容',
+      align: 'center'
+    },
     {
       prop: 'state',
       label: '工单状态',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
+      currentRender: ({ row, index }) => {
         if (row.state !== null) {
-          return (<Tag dictType={'work_order_status'} value={row.state}/>)
+          return (<Tag dictType={'work_order_status'} value={row.state} />)
         } else {
           return '--'
         }
@@ -67,14 +146,42 @@ const tableConfig = reactive({
       label: '电话拨打状态',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
+      currentRender: ({ row, index }) => {
         if (row.callState !== null) {
-          return (<Tag dictType={'call_status'} value={row.callState}/>)
+          return (<Tag dictType={'call_status'} value={row.callState} />)
         } else {
           return '--'
         }
       }
     },
+    {
+      prop: 'workOrderNumber',
+      label: '处理人',
+      align: 'center'
+    },
+    {
+      prop: 'workOrderNumber',
+      label: '处理内容',
+      align: 'center'
+    },
+    {
+      prop: 'workOrderTime',
+      label: '创建时间',
+      align: 'center',
+      width: 200
+    },
+    {
+      prop: 'workOrderTime',
+      label: '处理时间',
+      align: 'center',
+      width: 200
+    },
+    {
+      prop: 'workOrderTime',
+      label: '完成时间',
+      align: 'center',
+      width: 200
+    },
     {
       prop: 'oper',
       label: '操作',
@@ -82,24 +189,26 @@ const tableConfig = reactive({
       fixed: 'right',
       width: 150,
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
+      currentRender: ({ row, index }) => {
         let btn = []
-        btn.push({label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary'})
+        btn.push({ label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary' })
+        btn.push({ label: '关单', prem: auths.detail, func: () => handleClose(row), type: 'primary' })
+        btn.push({ label: '删除', prem: auths.detail, func: () => handleDelete(row), type: 'primary' })
         return (
-            <div style={{width: '100%'}}>
-              {
-                btn.map(item => (
-                    <el-button
-                        type={item.type}
-                        // v-perm={item.prem}
-                        onClick={() => item.func()}
-                        link
-                    >
-                      {item.label}
-                    </el-button>
-                ))
-              }
-            </div>
+          <div style={{ width: '100%' }}>
+            {
+              btn.map(item => (
+                <el-button
+                  type={item.type}
+                  // v-perm={item.prem}
+                  onClick={() => item.func()}
+                  link
+                >
+                  {item.label}
+                </el-button>
+              ))
+            }
+          </div>
         )
       }
     }
@@ -111,14 +220,66 @@ const tableConfig = reactive({
   ]
 })
 const headBtnClick = (key) => {
+  console.log(key);
+
   switch (key) {
     case 'add':
       handleAdd()
       break;
   }
 }
+
+const handleDetail = (row) => {
+  workEditRef.value.open(row)
+}
+
+const handleClose = (row) => {
+  ElMessageBox.confirm(
+    '确定要关单吗?',
+    '温馨提示',
+    {
+      confirmButtonText: 'OK',
+      cancelButtonText: 'Cancel',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      ElMessage({
+        type: 'success',
+        message: '关闭成功',
+      })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '关闭失败',
+      })
+    })
+}
+
+const handleDelete = (row) => {
+  ElMessageBox.confirm(
+    '确定要删除吗?',
+    '温馨提示',
+    {
+      confirmButtonText: 'OK',
+      cancelButtonText: 'Cancel',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      ElMessage({
+        type: 'success',
+        message: '删除成功',
+      })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '删除失败',
+      })
+    })
+}
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/task-management/components/WorkEdit.vue b/src/views/task-management/components/WorkEdit.vue
new file mode 100644
index 0000000..a12e29d
--- /dev/null
+++ b/src/views/task-management/components/WorkEdit.vue
@@ -0,0 +1,26 @@
+<script setup>
+import { ref } from 'vue';
+import { ElDrawer } from 'element-plus'
+
+//控制显示隐藏
+const visible = ref(false)
+const open = (row) => {
+    visible.value = true
+    console.log(111);
+    
+    console.log(row);
+}
+defineExpose({
+    open
+})
+</script>
+
+<template>
+    <el-drawer v-model="visible" 
+    size="50%"
+    title="工单详情" :direction="direction" :before-close="handleClose">
+        <span>Hi, there!</span>
+    </el-drawer>
+</template>
+
+<style lang="scss" scoped></style>
\ No newline at end of file

From 401322559f5d3f202dfc58c6810da4984ca8d6f2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 11 Sep 2024 13:11:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat=20:=20=E6=90=9C=E7=B4=A2=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E9=80=89=E6=8B=A9=E6=A1=86=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task-management/all-work-order/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/task-management/all-work-order/index.vue b/src/views/task-management/all-work-order/index.vue
index fe3efe4..62e4805 100644
--- a/src/views/task-management/all-work-order/index.vue
+++ b/src/views/task-management/all-work-order/index.vue
@@ -6,6 +6,7 @@
 
 <script setup lang="jsx">
 import WorkEdit from '../components/WorkEdit.vue';
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 
 const workEditRef = ref()
 const router = useRouter()
@@ -50,11 +51,12 @@ const searchConfig = reactive([
     label: '工单状态',
     prop: 'requirementName',
     props: {
-      placeholder: '请输入工单状态查询',
+      placeholder: '请选择工单状态查询',
+      cacheKey: 'work_order_status',
       clearable: true,
-      checkStrictly: true
+      filterable: true,
     },
-    component: 'el-input',
+    component:shallowRef(fvSelect)
   }, {
     label: '处理人',
     prop: 'requirementName',