From 5fb3dcbaeddfe1c0a93ac9cf83a12e56733be8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E8=90=BD=28YangLei=29?= <lzi.love@icloud.com>
Date: Thu, 8 Jul 2021 17:37:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MySelect/RequestSelect.vue     |  5 ++
 src/components/MySelect/search_select.vue     | 12 ++--
 .../task_managment/center/common/index.js     | 17 ------
 .../xunjian/task_managment/center/form.vue    | 17 ++----
 .../xunjian/task_managment/center/index.vue   | 61 +++++++++++--------
 5 files changed, 53 insertions(+), 59 deletions(-)
 delete mode 100644 src/pages/xunjian/task_managment/center/common/index.js

diff --git a/src/components/MySelect/RequestSelect.vue b/src/components/MySelect/RequestSelect.vue
index cce16fe..57228ac 100644
--- a/src/components/MySelect/RequestSelect.vue
+++ b/src/components/MySelect/RequestSelect.vue
@@ -24,6 +24,8 @@ export default {
         request: Function,
         formatData: { type: Object, default: undefined },
         getName: Function,
+        labelFiled: String, // 和 formatData 一样 传一种就行了
+        valueFiled: String,
     },
     data() {
         return {
@@ -34,6 +36,9 @@ export default {
         if (this.request) {
             const newArr = await this.request();
             this.data = this.formatData ? await formatObj(newArr, this.formatData) : newArr;
+            this.data = this.labelFiled
+                ? formatObj(newArr, { label: this.labelFiled, value: this.valueFiled, key: this.valueFiled })
+                : this.data;
         }
     },
     methods: {
diff --git a/src/components/MySelect/search_select.vue b/src/components/MySelect/search_select.vue
index 52b9877..2ae0aae 100644
--- a/src/components/MySelect/search_select.vue
+++ b/src/components/MySelect/search_select.vue
@@ -21,8 +21,9 @@ export default {
     props: {
         url: String,
         searchField: String,
-        formatData: Object,
         mode: String,
+        labelFiled: String,
+        valueFiled: String,
     },
     model: {
         prop: 'value',
@@ -38,10 +39,11 @@ export default {
     },
     methods: {
         async getData(searchString) {
-            this.options = formatObj(
-                await getReq(this.url, { [this.searchField]: searchString }),
-                this.formatData,
-            );
+            this.options = formatObj(await getReq(this.url, { [this.searchField]: searchString }), {
+                label: this.labelFiled,
+                value: this.valueFiled,
+                key: this.valueFiled,
+            });
         },
         handleSearch(value) {
             if (this.timeOut) clearTimeout(this.timeOut);
diff --git a/src/pages/xunjian/task_managment/center/common/index.js b/src/pages/xunjian/task_managment/center/common/index.js
deleted file mode 100644
index 610a23d..0000000
--- a/src/pages/xunjian/task_managment/center/common/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const areaFormatData = {
-    label: 'regionName',
-    value: 'regionId',
-    key: 'regionId',
-};
-
-export const statusFormtData = {
-    label: 'paramName',
-    value: 'paramValue',
-    key: 'paramValue',
-};
-
-export const banZuFormatData = {
-    label: 'paramName',
-    value: 'paramValue',
-    key: 'paramValue',
-};
diff --git a/src/pages/xunjian/task_managment/center/form.vue b/src/pages/xunjian/task_managment/center/form.vue
index a2e5282..d92ed28 100644
--- a/src/pages/xunjian/task_managment/center/form.vue
+++ b/src/pages/xunjian/task_managment/center/form.vue
@@ -4,8 +4,9 @@
             <a-form-model-item label="地区" prop="regionId">
                 <RequestSelect
                     :request="getAreaListDataApi"
-                    :formatData="areaFormatData"
                     v-model="form.regionId"
+                    labelFiled="regionName"
+                    valueFiled="regionId"
                 />
             </a-form-model-item>
 
@@ -21,8 +22,9 @@
             <a-form-model-item label="班组" prop="shiftType">
                 <RequestSelect
                     :request="getBanZuListApi"
-                    :formatData="banZuFormatData"
                     v-model="form.shiftType"
+                    labelFiled="paramName"
+                    valueFiled="paramValue"
                 />
             </a-form-model-item>
 
@@ -39,7 +41,8 @@
                 <SearchSelect
                     url="/api/v1/users/searching"
                     searchField="userName"
-                    :formatData="formatXunJianRenData"
+                    labelFiled="userName"
+                    valueFiled="userId"
                     v-model="form.inspectionIdList"
                     mode="multiple"
                 />
@@ -54,7 +57,6 @@ import RequestSelect from '@/components/MySelect/RequestSelect.vue';
 import SearchSelect from '@/components/MySelect/search_select.vue';
 import UrlSelect from '@/components/MySelect/url_select.vue';
 import { getAreaListDataApi, getBanZuListApi, addXunJianTaskApi } from '@/api';
-import { areaFormatData, banZuFormatData } from './common';
 
 export default {
     props: {
@@ -65,7 +67,6 @@ export default {
     data() {
         return {
             getAreaListDataApi,
-            banZuFormatData,
             getBanZuListApi,
             form: {},
             rules: {
@@ -75,12 +76,6 @@ export default {
                 routeId: [{ required: true }],
                 regionId: [{ required: true }],
             },
-            areaFormatData,
-            formatXunJianRenData: {
-                value: 'userId',
-                label: 'userName',
-                key: 'userId',
-            },
         };
     },
     computed: {
diff --git a/src/pages/xunjian/task_managment/center/index.vue b/src/pages/xunjian/task_managment/center/index.vue
index 5dabdc5..7cd9668 100644
--- a/src/pages/xunjian/task_managment/center/index.vue
+++ b/src/pages/xunjian/task_managment/center/index.vue
@@ -19,57 +19,73 @@
                 <a-date-picker
                     class="tw-w-full"
                     show-time
-                    v-model="query.startTime"
+                    v-model="query.endTime"
                     valueFormat="YYYY-MM-DD HH:mm:ss"
                 />
             </my-form-item>
             <my-form-item label="地区">
                 <RequestSelect
                     :request="getAreaListDataApi"
-                    :formatData="areaFormatData"
                     v-model="query.regionId"
+                    labelFiled="regionName"
+                    valueFiled="regionId"
                 />
             </my-form-item>
             <my-form-item label="专业">
-                <RequestSelect
-                    :request="getAreaListDataApi"
-                    :formatData="areaFormatData"
-                    v-model="query.regionId"
+                <UrlSelect
+                    :url="
+                        query.regionId
+                            ? `/ranger/inspection/api/v1/specialities/valid/regions/${query.regionId}/list`
+                            : ''
+                    "
+                    v-model="query.specialityId"
+                    labelFiled="specialityName"
+                    valueFiled="specialityId"
                 />
             </my-form-item>
             <my-form-item label="线路">
-                <RequestSelect
-                    :request="getAreaListDataApi"
-                    :formatData="areaFormatData"
-                    v-model="query.regionId"
+                <UrlSelect
+                    :url="
+                        query.regionId
+                            ? `/ranger/inspection/api/v1/routes/regions/${query.regionId}/list`
+                            : ''
+                    "
+                    labelFiled="routeName"
+                    valueFiled="routeId"
+                    v-model="query.routeId"
                 />
             </my-form-item>
             <my-form-item label="班组">
                 <RequestSelect
                     :request="getBanZuListApi"
-                    :formatData="banZuFormatData"
                     v-model="query.shiftType"
+                    labelFiled="paramName"
+                    valueFiled="paramValue"
                 />
             </my-form-item>
             <my-form-item label="巡检状态">
                 <RequestSelect
                     :request="getBusinessListApi"
-                    :formatData="statusFormtData"
                     v-model="query.inspectionState"
+                    labelFiled="paramName"
+                    valueFiled="paramValue"
                 />
             </my-form-item>
             <my-form-item label="任务类型">
                 <RequestSelect
                     :request="getTaskTypeApi"
-                    :formatData="taskTypeFormatData"
                     v-model="query.jobType"
+                    labelFiled="paramName"
+                    valueFiled="paramValue"
                 />
             </my-form-item>
             <my-form-item label="巡检人">
-                <RequestSelect
-                    :request="getBusinessListApi"
-                    :formatData="statusFormtData"
+                <SearchSelect
+                    url="/api/v1/users/searching"
+                    searchField="userName"
                     v-model="query.lastInspectionStaffId"
+                    labelFiled="userName"
+                    valueFiled="userId"
                 />
             </my-form-item>
         </template>
@@ -98,20 +114,20 @@
 <script>
 import Table from '@/components/table/table.vue';
 import Form from './form.vue';
+import UrlSelect from '@/components/MySelect/url_select.vue';
 import { getXunJianDownloadUrlApi } from '@/api';
 import { downloadFileByUrl } from '@/utils';
 import RequestSelect from '@/components/MySelect/RequestSelect.vue';
+import SearchSelect from '@/components/MySelect/search_select.vue';
 import { getAreaListDataApi, getBusinessListApi, getBanZuListApi, getTaskTypeApi } from '@/api';
-import { areaFormatData, statusFormtData, banZuFormatData } from './common';
 
 export default {
-    components: { Table, Form, RequestSelect },
+    components: { Table, Form, RequestSelect, UrlSelect, SearchSelect },
     data() {
         return {
             getAreaListDataApi,
             getBusinessListApi,
             getBanZuListApi,
-            banZuFormatData,
             getTaskTypeApi,
             addBtn: {
                 title: '新建临时任务',
@@ -124,13 +140,6 @@ export default {
                 { type: 'confirm' },
             ],
             selected: [],
-            areaFormatData,
-            statusFormtData,
-            taskTypeFormatData: {
-                label: 'paramName',
-                value: 'paramValue',
-                key: 'paramValue',
-            },
         };
     },
     methods: {
-- 
GitLab