+
+
+
+
+
+
+ 更多查询
+
重置
查询
@@ -27,15 +33,20 @@
:data-source="data"
:loading="loading"
v-bind="$attrs"
+ :scroll="scroll"
:rowKey="rowKey"
:pagination="pagination"
@change="pageChange"
:row-selection="selected ? rowSelection : undefined"
>
-
+
-
+
@@ -52,6 +63,7 @@
@close="hidden"
:maskClosable="false"
:title="title"
+ :afterVisibleChange="afterVisibleChange"
>
@@ -74,7 +86,7 @@ export default {
props: {
url: String,
addBtn: [Object, Boolean],
- buttons: Array,
+ buttons: [Array, Object],
noPage: Boolean,
formatData: Function,
rowKey: [String, Function],
@@ -84,6 +96,7 @@ export default {
default: 600,
},
noPadding: Boolean,
+ scroll: Object,
},
data() {
@@ -107,7 +120,7 @@ export default {
flex: 1,
overflow: 'hidden',
},
- type: 'add',
+ type: null,
row: null,
};
},
@@ -120,6 +133,13 @@ export default {
newBtn() {
return this.addBtn ? (typeof this.addBtn === 'object' ? this.addBtn : {}) : this.addBtn;
},
+ newButtons() {
+ return this.buttons
+ ? Array.isArray(this.buttons)
+ ? { data: this.buttons, title: '操作' }
+ : this.buttons
+ : null;
+ },
pagination() {
return this.noPage
? false
@@ -170,9 +190,13 @@ export default {
hidden() {
this.visible = false;
- this.title = this.addBtn?.title ?? defaultTitle;
- this.type = 'add';
- this.row = null;
+ },
+ afterVisibleChange(visible) {
+ if (!visible) {
+ this.title = this.addBtn?.title ?? defaultTitle;
+ this.type = null;
+ this.row = null;
+ }
},
show(params) {
@@ -189,8 +213,35 @@ export default {
addBtnClick() {
const { click } = typeof this.addBtn === 'object' ? this.addBtn : {};
click && click();
+ this.type = 'add';
this.visible = true;
},
},
};
+
+
diff --git a/src/pages/xunjian/task_managment/center/detail.vue b/src/pages/xunjian/task_managment/center/detail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..99a473776d8eb61d5de48dd6add3d234f53bd164
--- /dev/null
+++ b/src/pages/xunjian/task_managment/center/detail.vue
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/xunjian/task_managment/center/index.vue b/src/pages/xunjian/task_managment/center/index.vue
index ae7f348f112383a7987921bc7d0d85cba8883660..c722128db5b6f5c15a1be143e86c601a0870d087 100644
--- a/src/pages/xunjian/task_managment/center/index.vue
+++ b/src/pages/xunjian/task_managment/center/index.vue
@@ -9,31 +9,59 @@
:drawerWidth="800"
>
-
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -99,6 +127,7 @@
+
@@ -124,9 +153,11 @@ import RequestSelect from '@/components/MySelect/RequestSelect.vue';
import SearchSelect from '@/components/MySelect/search_select.vue';
import { getAreaListDataApi, getBusinessListApi, getBanZuListApi, getTaskTypeApi } from '@/api';
import Progress from './progress.vue';
+import Detail from './detail.vue';
+import MoreItem from '@/components/table/more_item.vue';
export default {
- components: { Table, Form, RequestSelect, UrlSelect, SearchSelect, Progress },
+ components: { Table, Form, RequestSelect, UrlSelect, SearchSelect, Progress, Detail, MoreItem },
data() {
return {
getAreaListDataApi,
@@ -139,6 +170,7 @@ export default {
buttons: [
{
label: '详情',
+ click: this.viewDetail,
},
{ label: '进度', click: this.viewProgress },
{
@@ -162,6 +194,9 @@ export default {
viewProgress(row) {
this.$refs.table.show({ title: '任务进度', type: 'progress', row });
},
+ viewDetail(row) {
+ this.$refs.table.show({ title: '任务明细', type: 'detail', row });
+ },
},
};
diff --git a/src/pages/xunjian/task_managment/center/progress.vue b/src/pages/xunjian/task_managment/center/progress.vue
index 800398522248301890399d783d58ebd7fbc3017b..75538e9537441898d3aa0f291d3d85f6058d7096 100644
--- a/src/pages/xunjian/task_managment/center/progress.vue
+++ b/src/pages/xunjian/task_managment/center/progress.vue
@@ -37,8 +37,6 @@
-unitNum, itemNum, abnormalNum, placeNum, finishedPercent: formatFloat((finishedNum / unitNum * 100), 2),
-