From 690444cbda62ceeaa1c759dc0cb9aef6fec94a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Thu, 21 Sep 2023 13:56:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shopManage/index.ts                   |  6 +++++
 .../login/components/AccountLoginForm.vue     |  1 +
 .../inspectionIndex.vue                       |  6 +++++
 .../inspectionModal.vue                       |  9 -------
 .../inspectionSearch.vue                      | 26 +++++++++++++++----
 src/views/shopManage/shopIndex.vue            |  4 +++
 src/views/shopManage/shopModal.vue            | 19 +++++++-------
 types/components.d.ts                         |  1 +
 8 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/src/api/shopManage/index.ts b/src/api/shopManage/index.ts
index 64c881a..1c7a423 100644
--- a/src/api/shopManage/index.ts
+++ b/src/api/shopManage/index.ts
@@ -25,9 +25,15 @@ export function getReservation(pageParams: queryReservation) {
     params: pageParams
   })
 }
+
 export function deleteShop(id: number) {
   return httpClient.delete<ApiResult<void>>(`/store/${id}`)
 }
+
 export function exportI18nDataExcel(params: queryReservation) {
   return httpClient.get('/store/export', { params, responseType: 'blob' })
 }
+// 所有店铺列表
+export function getShopQueryAll(type: number) {
+  return httpClient.get('/store/queryAll', { params: { roleType: type } })
+}
diff --git a/src/views/login/components/AccountLoginForm.vue b/src/views/login/components/AccountLoginForm.vue
index bac671b..1d09a02 100644
--- a/src/views/login/components/AccountLoginForm.vue
+++ b/src/views/login/components/AccountLoginForm.vue
@@ -30,6 +30,7 @@
       <a-input
         v-model:value="modelRef.code"
         size="large"
+        type="number"
         auto-complete="off"
         placeholder="验证码"
         style="width: 63%"
diff --git a/src/views/qualityInspectionDistribution/inspectionIndex.vue b/src/views/qualityInspectionDistribution/inspectionIndex.vue
index 5a106d9..918481b 100644
--- a/src/views/qualityInspectionDistribution/inspectionIndex.vue
+++ b/src/views/qualityInspectionDistribution/inspectionIndex.vue
@@ -98,6 +98,10 @@ const columns: ProColumns[] = [
     title: '联系方式',
     dataIndex: 'customNid'
   },
+  {
+    title: '分发门店',
+    dataIndex: 'storeName'
+  },
   {
     title: '分发状态',
     dataIndex: 'enrollStatus',
@@ -106,6 +110,8 @@ const columns: ProColumns[] = [
         return h('div', '待分发')
       } else if (record.enrollStatus === 1) {
         return h('div', '已分发')
+      } else if (record.enrollStatus === 2) {
+        return h('div', '已通过')
       }
     }
   },
diff --git a/src/views/qualityInspectionDistribution/inspectionModal.vue b/src/views/qualityInspectionDistribution/inspectionModal.vue
index c314e07..0ecb230 100644
--- a/src/views/qualityInspectionDistribution/inspectionModal.vue
+++ b/src/views/qualityInspectionDistribution/inspectionModal.vue
@@ -1,11 +1,3 @@
-<!--
- * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
- * @Date: 2023-09-12 13:56:02
- * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
- * @LastEditTime: 2023-09-14 17:37:10
- * @FilePath: \byhl-zt\src\views\qualityInspectionDistribution\inspectionModal.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
 <template>
   <a-modal
     :title="title"
@@ -84,7 +76,6 @@ import { overrideProperties } from '@/utils/bean-utils'
 import { message } from 'ant-design-vue'
 import type { CustomerDTO, GeopoliticalCustomersRecord } from '@/api/geopoliticalCustomers/types'
 import { updateCustomerAudit } from '@/api/geopoliticalCustomers/index'
-import { doRequest } from '@/utils/axios/request'
 import { useAdminForm, useFormAction, FormAction, labelCol, wrapperCol } from '@/hooks/form'
 import { useUserStore } from '@/stores/user-store'
 //预约时间
diff --git a/src/views/qualityInspectionDistribution/inspectionSearch.vue b/src/views/qualityInspectionDistribution/inspectionSearch.vue
index 1ef3d99..280cc8f 100644
--- a/src/views/qualityInspectionDistribution/inspectionSearch.vue
+++ b/src/views/qualityInspectionDistribution/inspectionSearch.vue
@@ -22,11 +22,16 @@
           </a-form-item>
         </a-col>
         <a-col :xl="8" :md="12" :sm="24">
-          <a-form-item label="分发门店">
-            <a-input v-model:value="formModel.customNid" placeholder="请输入" />
+          <a-form-item label="分发门店" name="customNid">
+            <a-select
+              v-model:value="formModel.customNid"
+              :field-names="{ label: 'storeName', value: 'id' }"
+              :options="shopList"
+              placeholder="请选择分发门店"
+            />
           </a-form-item>
         </a-col>
-        <a-col :xl="8" :md="12" :sm="24">
+        <!-- <a-col :xl="8" :md="12" :sm="24">
           <a-form-item label="分发时间">
             <a-range-picker
               v-model:value="searchTimeValue"
@@ -38,7 +43,7 @@
               }"
             />
           </a-form-item>
-        </a-col>
+        </a-col> -->
         <a-col :xl="24" :md="24" :sm="24">
           <search-actions :loading="props.loading" @search="search" @reset="reset" />
         </a-col>
@@ -50,8 +55,10 @@
 <script setup lang="ts">
 import { Form } from 'ant-design-vue'
 import type { GeopoliticalCustomersSearch } from '@/api/geopoliticalCustomers/types'
+import { getShopQueryAll } from '@/api/shopManage/index'
 import dayjs from 'dayjs'
 import type { Dayjs } from 'dayjs'
+import { doRequest } from '@/utils/axios/request'
 //获取当前账号角色
 import { useUserStore } from '@/stores/user-store'
 const { userInfo } = useUserStore()
@@ -61,6 +68,7 @@ onMounted(() => {
   console.log(userInfo, 'userInfo?.permissions')
   // userInfoCurrent = userInfo?.roleCodes
   userInfoCurrent.value = userInfo?.roleCodes?.toLocaleString()
+  initShopList()
 })
 
 const useForm = Form.useForm
@@ -78,7 +86,7 @@ const props = withDefaults(
 const emits = defineEmits<{
   (e: 'search', params: Record<string, any>): void
 }>()
-
+const shopList: any = ref([])
 const searchTimeValue = ref<[Dayjs, Dayjs]>()
 const formModel = reactive<GeopoliticalCustomersSearch>({
   customName: '',
@@ -88,6 +96,14 @@ const formModel = reactive<GeopoliticalCustomersSearch>({
 
 const { resetFields } = useForm(formModel)
 
+const initShopList = () => {
+  doRequest(getShopQueryAll(2), {
+    onSuccess: res => {
+      shopList.value = res.data
+    }
+  })
+}
+
 const search = () => {
   const param = toRaw(formModel)
   if (searchTimeValue.value && searchTimeValue.value.length == 2) {
diff --git a/src/views/shopManage/shopIndex.vue b/src/views/shopManage/shopIndex.vue
index 0f5bd3f..4906ac5 100644
--- a/src/views/shopManage/shopIndex.vue
+++ b/src/views/shopManage/shopIndex.vue
@@ -155,6 +155,10 @@ const columns: ProColumns[] = [
       }
     }
   },
+  {
+    title: '承接销售',
+    dataIndex: 'userName'
+  },
   {
     title: '创建日期',
     dataIndex: 'createTime',
diff --git a/src/views/shopManage/shopModal.vue b/src/views/shopManage/shopModal.vue
index 8da1b2e..e20fa41 100644
--- a/src/views/shopManage/shopModal.vue
+++ b/src/views/shopManage/shopModal.vue
@@ -235,14 +235,16 @@ const initMap = () => {
     }
     placeSearch.value = new AMap.PlaceSearch(placeOptions)
   })
-  autoComplete.value.on('select', (e: any) => {
-    placeSearch.value.setCity(e.poi.adcode)
-    placeSearch.value.search(e.poi.name)
-  })
-  placeSearch.value.on('markerClick', (e: any) => {
-    formModel.address = `${e.data.pname}${e.data.cityname}${e.data.adname}${e.data.address}`
-    anchorData = { ...e.data }
-  })
+  setTimeout(() => {
+    autoComplete.value?.on('select', (e: any) => {
+      placeSearch.value.setCity(e.poi.adcode)
+      placeSearch.value.search(e.poi.name)
+    })
+    placeSearch.value?.on('markerClick', (e: any) => {
+      formModel.address = `${e.data.pname}${e.data.cityname}${e.data.adname}${e.data.address}`
+      anchorData = { ...e.data }
+    })
+  }, 300)
   map.value.addControl(geolocation)
 }
 
@@ -288,7 +290,6 @@ const handleSubmit = () => {
       )
   })
 }
-
 defineExpose({
   async open(newFormAction: FormAction, record?: shopDetailVO) {
     await selectUserList()
diff --git a/types/components.d.ts b/types/components.d.ts
index b715ca7..b6e13ef 100644
--- a/types/components.d.ts
+++ b/types/components.d.ts
@@ -69,6 +69,7 @@ declare module '@vue/runtime-core' {
     ATag: typeof import('ant-design-vue/es')['Tag']
     ATextarea: typeof import('ant-design-vue/es')['Textarea']
     ATimePicker: typeof import('ant-design-vue/es')['TimePicker']
+    ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     ATransfer: typeof import('ant-design-vue/es')['Transfer']
     ATree: typeof import('ant-design-vue/es')['Tree']

From 8c96b991051948182573b591bf9c472d1fec44d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Thu, 21 Sep 2023 16:49:05 +0800
Subject: [PATCH 2/2] 1

---
 src/components/SelectLanguage/index.vue    | 6 +++---
 src/views/system/role/SysRoleSelect.vue    | 4 +++-
 src/views/system/user/SysUserFormModal.vue | 7 ++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/SelectLanguage/index.vue b/src/components/SelectLanguage/index.vue
index a7e9d7b..0cbad83 100644
--- a/src/components/SelectLanguage/index.vue
+++ b/src/components/SelectLanguage/index.vue
@@ -1,8 +1,8 @@
 <template>
   <a-dropdown>
-    <TranslationOutlined style="font-size: 18px" />
+    <!-- <TranslationOutlined style="font-size: 18px" /> -->
 
-    <template #overlay>
+    <!-- <template #overlay>
       <a-menu :selected-keys="[i18nStore.language]">
         <a-menu-item
           v-for="language of supportLanguage"
@@ -13,7 +13,7 @@
           {{ language.title }}
         </a-menu-item>
       </a-menu>
-    </template>
+    </template> -->
   </a-dropdown>
 </template>
 <script setup lang="ts">
diff --git a/src/views/system/role/SysRoleSelect.vue b/src/views/system/role/SysRoleSelect.vue
index f8ca1a5..9d889c1 100644
--- a/src/views/system/role/SysRoleSelect.vue
+++ b/src/views/system/role/SysRoleSelect.vue
@@ -30,11 +30,13 @@ const props = defineProps(
 )
 
 const emits = defineEmits<{
-  (e: 'update:value', selectedValue: SelectRoleValue): void
+  (e: 'update:value', selectedValue: SelectRoleValue): Array<any>,
+  (e: 'changes', selectedValue: SelectRoleValue): Array<any>
 }>()
 
 const onChange = (selectedValue: SelectValue) => {
   emits('update:value', selectedValue as SelectRoleValue)
+  emits('changes', selectedValue as SelectRoleValue)
 }
 
 const filterOption = (input: string, option: any) => {
diff --git a/src/views/system/user/SysUserFormModal.vue b/src/views/system/user/SysUserFormModal.vue
index 71fb2e2..fe38609 100644
--- a/src/views/system/user/SysUserFormModal.vue
+++ b/src/views/system/user/SysUserFormModal.vue
@@ -59,6 +59,7 @@
               mode="multiple"
               allow-clear
               placeholder="请选择"
+              @changes="updateRole"
             />
           </a-form-item>
         </a-col>
@@ -145,7 +146,11 @@ const handleSubmit = () => {
     }
   )
 }
-
+const updateRole = () => {
+  if (formModel.roleCodes.length > 1) {
+    formModel.roleCodes.splice(-1)
+  }
+}
 /* 弹窗关闭方法 */
 const handleClose = () => {
   closeModal()