diff --git a/.env.development b/.env.development
index c2d2c3d..52ccbeb 100644
--- a/.env.development
+++ b/.env.development
@@ -1,2 +1,2 @@
# 开发环境基地址
-VITE_BASE_URL='http://frp.feashow.cn:31800/'
+VITE_BASE_URL='/api'
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 766f114..8c2230a 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,12 +1,142 @@
- 工作台
+
-
diff --git a/src/views/task-management/all-work-order/index.vue b/src/views/task-management/all-work-order/index.vue
index b20d76d..2d6222e 100644
--- a/src/views/task-management/all-work-order/index.vue
+++ b/src/views/task-management/all-work-order/index.vue
@@ -144,8 +144,8 @@ const tableConfig = reactive({
align: 'center',
showOverflowTooltip: false,
currentRender: ({ row, index }) => {
- if (row.state !== null) {
- return ()
+ if (row.orderState !== null) {
+ return ()
} else {
return '--'
}
@@ -155,6 +155,7 @@ const tableConfig = reactive({
prop: 'callState',
label: '电话拨打状态',
align: 'center',
+ width: 150,
showOverflowTooltip: false,
currentRender: ({ row, index }) => {
if (row.callState !== null) {
@@ -169,6 +170,7 @@ const tableConfig = reactive({
label: '处理人',
align: 'center'
},
+
{
prop: 'processedContent',
label: '处理内容',
@@ -192,6 +194,11 @@ const tableConfig = reactive({
align: 'center',
width: 200
},
+ {
+ prop: 'workOrderNumber',
+ label: '关单人',
+ align: 'center'
+ },
{
prop: 'oper',
label: '操作',
@@ -231,6 +238,16 @@ const tableConfig = reactive({
// {name: '新增', key: 'add', color: '#DED0B2', auth: auths.report},
]
})
+const search = (val) => {
+ let obj = { ...val }
+ if (obj.dateValue) {
+ obj.startTime = obj.dateValue[0]
+ obj.endTime = obj.dateValue[1]
+ delete obj.dateValue
+ }
+ tableConfig.params = obj
+ tableIns.value.refresh()
+}
const headBtnClick = (key) => {
// console.log(key);
diff --git a/src/views/task-management/components/WorkDialog.vue b/src/views/task-management/components/WorkDialog.vue
index af47bcc..f16e025 100644
--- a/src/views/task-management/components/WorkDialog.vue
+++ b/src/views/task-management/components/WorkDialog.vue
@@ -112,7 +112,7 @@ defineExpose({
auto>
-