diff --git a/src/api/work/order.js b/src/api/work/order.js
index b4f187f..0ccc0d2 100644
--- a/src/api/work/order.js
+++ b/src/api/work/order.js
@@ -23,3 +23,18 @@ export function modify(data) {
data
});
}
+// 派单选择指派人
+export function getUser(params) {
+ return request({
+ url: '/order/getUser',
+ params
+ });
+}
+// 批量派单
+export function startOrder(data) {
+ return request({
+ url: '/order/startOrder',
+ method:'POST',
+ data
+ });
+}
diff --git a/src/api/work/orderHandle.js b/src/api/work/orderHandle.js
new file mode 100644
index 0000000..66aa872
--- /dev/null
+++ b/src/api/work/orderHandle.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request';
+
+// 批量放弃工单
+export function orderClose(data) {
+ return request({
+ url: '/order/close',
+ method: 'POST',
+ data
+ });
+}
+// 工人查询所有工单 分页查询
+export function getOrderList(params) {
+ return request({
+ url: '/order/getOrderList',
+ params
+ });
+}
+// 工人查询具体的工单 分页查询
+export function getStartList(params) {
+ return request({
+ url: '/order/getStartList',
+ params
+ });
+}
+// 获取工人具体信息是否填写
+export function getWriteStatus(params) {
+ return request({
+ url: '/order/getWriteStatus',
+ params
+ });
+}
+// 填写表单
+export function writeForm(data) {
+ return request({
+ url: '/order/writeForm',
+ method: 'POST',
+ data
+ });
+}
+// 表单的回显
+export function getWriteForm(params) {
+ return request({
+ url: '/order/getWriteForm',
+ params
+ });
+}
diff --git a/src/api/work/orderHistory.js b/src/api/work/orderHistory.js
new file mode 100644
index 0000000..8765ba8
--- /dev/null
+++ b/src/api/work/orderHistory.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request';
+// 查询所有弃单 分页查询
+export function giveUpList(params) {
+ return request({
+ url: '/order/giveUpList',
+ params
+ });
+}
+// 查询弃单的详情/说明
+export function giveUpNote(params) {
+ return request({
+ url: '/order/giveUpNote',
+ params
+ });
+}
\ No newline at end of file
diff --git a/src/views/workOrderManage/orderApproval/detail.vue b/src/views/workOrderManage/orderApproval/detail.vue
new file mode 100644
index 0000000..ba202d5
--- /dev/null
+++ b/src/views/workOrderManage/orderApproval/detail.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+ 通过
+ 驳回
+
+
+
+
+
+
+
+
+ {{ props.row.workCode }}
+
+
+ {{ props.row.workCode }}
+
+
+ {{ props.row.workCode }}
+
+
+ {{ props.row.workCode }}
+
+
+ {{ props.row.workCode }}
+
+
+
+
+
+
+
+ {{ scope.row.proName + scope.row.cityName + scope.row.disName }}
+
+
+
+
+
+
+ {{ scope.row.warningLevel | toChinaNum }}级
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workOrderManage/orderApproval/index.vue b/src/views/workOrderManage/orderApproval/index.vue
new file mode 100644
index 0000000..b62276a
--- /dev/null
+++ b/src/views/workOrderManage/orderApproval/index.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+ 工单审批
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/workOrderManage/orderHandle/detail.vue b/src/views/workOrderManage/orderHandle/detail.vue
new file mode 100644
index 0000000..a5ff21f
--- /dev/null
+++ b/src/views/workOrderManage/orderHandle/detail.vue
@@ -0,0 +1,308 @@
+
+
+
+
+
+
+
+
+
+
+ 提交结果
+
+
+
+
+
+
+ {{ scope.row.proName + scope.row.cityName + scope.row.disName }}
+
+
+
+
+
+
+ {{ scope.row.warningLevel | toChinaNum }}级
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+ 填写表单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workOrderManage/orderHandle/index.vue b/src/views/workOrderManage/orderHandle/index.vue
new file mode 100644
index 0000000..248686a
--- /dev/null
+++ b/src/views/workOrderManage/orderHandle/index.vue
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 重置
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ {{ scope.row.status==1?'处理中':scope.row.status==2?'审核中':'审批驳回'}}
+
+
+
+
+ 工单处理
+
+
+
+
+
+
+
+ {{strNote}}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+ {{ scope.row.proName + scope.row.cityName + scope.row.disName }}
+
+
+
+
+
+
+ {{ scope.row.warningLevel | toChinaNum }}级
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+ {{strNote}}
+
+
+
+
+
+
+
+ {{ scope.row.proName + scope.row.cityName + scope.row.disName }}
+
+
+
+
+
+
+ {{ scope.row.warningLevel | toChinaNum }}级
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime | formatDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 派单
+
+
+
+
+
+
+
diff --git a/src/views/workOrderManage/orderList/index.vue b/src/views/workOrderManage/orderList/index.vue
index 64190dc..7111c15 100644
--- a/src/views/workOrderManage/orderList/index.vue
+++ b/src/views/workOrderManage/orderList/index.vue
@@ -3,38 +3,81 @@
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
@@ -44,8 +87,17 @@
-
-
+
+
@@ -57,17 +109,50 @@
-->
-
+
+
+
+
+
+
+
+ 查询
+
+ 重置
-
-
+
+
+ 批量派单
+
+ 批量弃单
-
+
-
+
-
+
+
{{ scope.row.proName + scope.row.cityName + scope.row.disName }}
-
-
+
+
-
+
{{ scope.row.warningLevel | toChinaNum }}级
-
-
-
-
+
+
+
+
-
+
-
+
{{ scope.row.createTime | formatDate }}
+
+
+
+ 信号量选项
+
+
+ 派单
+ 弃单
+
+
-
+
@@ -163,16 +344,18 @@
diff --git a/vue.config.js b/vue.config.js
index e279a98..9b4ed22 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,7 +34,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://192.168.99.118:8080`,
+ target: `http://192.168.99.239:8080`,
+ // target: `http://192.168.99.118:8080`,
// target: `http://47.115.73.110:8080`,
// target: `http://121.37.250.170:8080`,
// target: `http://192.168.0.129:8080`,